WIP: Proposal for StreamingRunWatcher API

.devcontainer/dotnet/devcontainer.json

@@ -1,11 +1,10 @@
 {
   "name": "C# (.NET)",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:10.0",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:9.0",
   "features": {
     "ghcr.io/devcontainers/features/dotnet:2.4.0": {},
     "ghcr.io/devcontainers/features/powershell:1.5.1": {},
-    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {}
+    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {}
   },
   "workspaceFolder": "/workspaces/agent-framework/dotnet/",
   "customizations": {

.github/CODEOWNERS

@@ -1,4 +0,0 @@
-# Code ownership assignments
-# https://docs.github.com/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-
-python/packages/azurefunctions/ @microsoft/agentframework-durabletask-developers

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Documentation
-    url: https://aka.ms/agent-framework
-    about: Check out the official documentation for guides and API reference.
-  - name: Discussions
-    url: https://github.com/microsoft/agent-framework/discussions
-    about: Ask questions and share ideas in GitHub Discussions.

.github/ISSUE_TEMPLATE/issue.yml

@@ -1,203 +0,0 @@
-name: Issue Report
-description: Report a bug, request a feature, or ask a question about Microsoft Agent Framework
-title: "[Issue]: "
-labels: ["triage"]
-body:
-  - type: dropdown
-    id: language
-    attributes:
-      label: Language
-      description: Which language/SDK are you using?
-      options:
-        - .NET
-        - Python
-        - None / Not Applicable
-    validations:
-      required: true
-
-  - type: dropdown
-    id: issue-type
-    attributes:
-      label: Type of Issue
-      description: What type of issue is this?
-      options:
-        - Bug
-        - Feature Request
-        - Question
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Version Information
-        Please provide the version of the package(s) you are using. Select the relevant packages below.
-
-  - type: markdown
-    attributes:
-      value: "### .NET Packages"
-
-  - type: input
-    id: dotnet-agents-ai
-    attributes:
-      label: Microsoft.Agents.AI
-      description: Version of Microsoft.Agents.AI (e.g., 1.0.0)
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-abstractions
-    attributes:
-      label: Microsoft.Agents.AI.Abstractions
-      description: Version of Microsoft.Agents.AI.Abstractions
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-openai
-    attributes:
-      label: Microsoft.Agents.AI.OpenAI
-      description: Version of Microsoft.Agents.AI.OpenAI
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-azureai
-    attributes:
-      label: Microsoft.Agents.AI.AzureAI
-      description: Version of Microsoft.Agents.AI.AzureAI
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-anthropic
-    attributes:
-      label: Microsoft.Agents.AI.Anthropic
-      description: Version of Microsoft.Agents.AI.Anthropic
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-hosting
-    attributes:
-      label: Microsoft.Agents.AI.Hosting
-      description: Version of Microsoft.Agents.AI.Hosting
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-agents-ai-workflows
-    attributes:
-      label: Microsoft.Agents.AI.Workflows
-      description: Version of Microsoft.Agents.AI.Workflows
-      placeholder: "e.g., 1.0.0"
-    validations:
-      required: false
-
-  - type: input
-    id: dotnet-other-packages
-    attributes:
-      label: Other .NET Packages
-      description: List any other Microsoft.Agents.* packages and versions you are using
-      placeholder: "e.g., Microsoft.Agents.AI.CopilotStudio: 1.0.0, Microsoft.Agents.AI.Purview: 1.0.0"
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: "### Python Packages"
-
-  - type: input
-    id: python-core
-    attributes:
-      label: agent-framework-core
-      description: Version of agent-framework-core
-      placeholder: "e.g., 1.0.0b1"
-    validations:
-      required: false
-
-  - type: input
-    id: python-azure-ai
-    attributes:
-      label: agent-framework-azure-ai
-      description: Version of agent-framework-azure-ai
-      placeholder: "e.g., 1.0.0b1"
-    validations:
-      required: false
-
-  - type: input
-    id: python-anthropic
-    attributes:
-      label: agent-framework-anthropic
-      description: Version of agent-framework-anthropic
-      placeholder: "e.g., 1.0.0b1"
-    validations:
-      required: false
-
-  - type: input
-    id: python-azurefunctions
-    attributes:
-      label: agent-framework-azurefunctions
-      description: Version of agent-framework-azurefunctions
-      placeholder: "e.g., 1.0.0b1"
-    validations:
-      required: false
-
-  - type: input
-    id: python-other-packages
-    attributes:
-      label: Other Python Packages
-      description: List any other agent-framework-* packages and versions you are using
-      placeholder: "e.g., agent-framework-mem0: 1.0.0b1, agent-framework-redis: 1.0.0b1"
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: "---"
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Please provide a clear and detailed description of the issue, feature request, or question.
-      placeholder: |
-        For bugs: Describe what happened, what you expected to happen, and steps to reproduce.
-        For features: Describe the feature you'd like and why it would be useful.
-        For questions: Describe what you're trying to accomplish.
-    validations:
-      required: true
-
-  - type: textarea
-    id: code-sample
-    attributes:
-      label: Code Sample
-      description: If applicable, provide a minimal code sample that demonstrates the issue or your use case.
-      placeholder: |
-        ```python
-        # Your code here
-        ```
-
-        or
-
-        ```csharp
-        // Your code here
-        ```
-      render: markdown
-    validations:
-      required: false
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Add any other context, screenshots, error messages, or stack traces that might be helpful.
-      placeholder: "Any additional information..."
-    validations:
-      required: false

.github/actions/azure-functions-integration-setup/action.yml

@@ -1,48 +0,0 @@
-name: Azure Functions Integration Test Setup
-description: Prepare local emulators and tools for Azure Functions integration tests
-
-runs:
-    using: "composite"
-    steps:
-      - name: Start Durable Task Scheduler Emulator
-        shell: bash
-        run: |
-          if [ "$(docker ps -aq -f name=dts-emulator)" ]; then
-            echo "Stopping and removing existing Durable Task Scheduler Emulator"
-            docker rm -f dts-emulator
-          fi
-          echo "Starting Durable Task Scheduler Emulator"
-          docker run -d --name dts-emulator -p 8080:8080 -p 8082:8082 mcr.microsoft.com/dts/dts-emulator:latest
-          echo "Waiting for Durable Task Scheduler Emulator to be ready"
-          timeout 30 bash -c 'until curl --silent http://localhost:8080/healthz; do sleep 1; done'
-          echo "Durable Task Scheduler Emulator is ready"
-      - name: Start Azurite (Azure Storage emulator)
-        shell: bash
-        run: |
-          if [ "$(docker ps -aq -f name=azurite)" ]; then
-            echo "Stopping and removing existing Azurite (Azure Storage emulator)"
-            docker rm -f azurite
-          fi
-          echo "Starting Azurite (Azure Storage emulator)"
-          docker run -d --name azurite -p 10000:10000 -p 10001:10001 -p 10002:10002 mcr.microsoft.com/azure-storage/azurite
-          echo "Waiting for Azurite (Azure Storage emulator) to be ready"
-          timeout 30 bash -c 'until curl --silent http://localhost:10000/devstoreaccount1; do sleep 1; done'
-          echo "Azurite (Azure Storage emulator) is ready"
-      - name: Start Redis
-        shell: bash
-        run: |
-          if [ "$(docker ps -aq -f name=redis)" ]; then
-            echo "Stopping and removing existing Redis"
-            docker rm -f redis
-          fi
-          echo "Starting Redis"
-          docker run -d --name redis -p 6379:6379 redis:latest
-          echo "Waiting for Redis to be ready"
-          timeout 30 bash -c 'until docker exec redis redis-cli ping | grep -q PONG; do sleep 1; done'
-          echo "Redis is ready"
-      - name: Install Azure Functions Core Tools
-        shell: bash
-        run: |
-          echo "Installing Azure Functions Core Tools"
-          npm install -g azure-functions-core-tools@4 --unsafe-perm true
-          func --version

.github/dependabot.yml

@@ -11,6 +11,9 @@ updates:
     schedule:
       interval: "cron"
       cronjob: "0 8 * * 4,0" # Every Thursday(4) and Sunday(0) at 8:00 UTC
+    experimental:
+      nuget-native-updater: false
+      enable-cooldown-metrics-collection: false
     ignore:
       # For all System.* and Microsoft.Extensions/Bcl.* packages, ignore all major version updates
       - dependency-name: "System.*"
@@ -25,14 +28,6 @@ updates:
       - "dependencies"
 
   # Maintain dependencies for python
-  - package-ecosystem: "pip"
-    directory: "python/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-    labels:
-      - "python"
-      - "dependencies"
   - package-ecosystem: "uv"
     directory: "python/"
     schedule:

.github/instructions/durabletask-dotnet.instructions.md

@@ -1,17 +0,0 @@
----
-applyTo: "dotnet/src/Microsoft.Agents.AI.DurableTask/**,dotnet/src/Microsoft.Agents.AI.Hosting.AzureFunctions/**"
----
-
-# Durable Task area code instructions
-
-The following guidelines apply to pull requests that modify files under
-`dotnet/src/Microsoft.Agents.AI.DurableTask/**` or
-`dotnet/src/Microsoft.Agents.AI.Hosting.AzureFunctions/**`:
-
-## CHANGELOG.md
-
-- Each pull request that modifies code should add just one bulleted entry to the `CHANGELOG.md` file containing a change title (usually the PR title) and a link to the PR itself.
-- New PRs should be added to the top of the `CHANGELOG.md` file under a "## [Unreleased]" heading.
-- If the PR is the first since the last release, the existing "## [Unreleased]" heading should be replaced with a "## v[X.Y.Z]" heading and the PRs since the last release should be added to the new "## [Unreleased]" heading.
-- The style of new `CHANGELOG.md` entries should match the style of the other entries in the file.
-- If the PR introduces a breaking change, the changelog entry should be prefixed with "[BREAKING]".

.github/upgrades/prompts/SemanticKernelToAgentFramework.md

@@ -142,9 +142,9 @@ Replace these Semantic Kernel agent classes with their Agent Framework equivalen
 |----------------------|----------------------------|-------------------|
 | `IChatCompletionService` | `IChatClient` | Convert to `IChatClient` using `chatService.AsChatClient()` extensions |
 | `ChatCompletionAgent` | `ChatClientAgent` | Remove `Kernel` parameter, add `IChatClient` parameter |
-| `OpenAIAssistantAgent` | `AIAgent` (via extension) | ⚠️ **Deprecated** - Use Responses API instead. <br> **New**: `OpenAIClient.GetAssistantClient().CreateAIAgent()` <br> **Existing**: `OpenAIClient.GetAssistantClient().GetAIAgent(assistantId)` |
+| `OpenAIAssistantAgent` | `AIAgent` (via extension) | **New**: `OpenAIClient.GetAssistantClient().CreateAIAgent()` <br> **Existing**: `OpenAIClient.GetAssistantClient().GetAIAgent(assistantId)` |
 | `AzureAIAgent` | `AIAgent` (via extension) | **New**: `PersistentAgentsClient.CreateAIAgent()` <br> **Existing**: `PersistentAgentsClient.GetAIAgent(agentId)` |
-| `OpenAIResponseAgent` | `AIAgent` (via extension) | Replace with `OpenAIClient.GetOpenAIResponseClient(modelId).CreateAIAgent()` |
+| `OpenAIResponseAgent` | `AIAgent` (via extension) | Replace with `OpenAIClient.GetOpenAIResponseClient().CreateAIAgent()` |
 | `A2AAgent` | `AIAgent` (via extension) | Replace with `A2ACardResolver.GetAIAgentAsync()` |
 | `BedrockAgent` | Not supported | Custom implementation required |
 
@@ -529,14 +529,14 @@ AIAgent agent = new OpenAIClient(apiKey)
     .CreateAIAgent(instructions: instructions);
 ```
 
-**OpenAI Assistants (New):** ⚠️ *Deprecated - Use Responses API instead*
+**OpenAI Assistants (New):**
 ```csharp
 AIAgent agent = new OpenAIClient(apiKey)
     .GetAssistantClient()
     .CreateAIAgent(modelId, instructions: instructions);
 ```
 
-**OpenAI Assistants (Existing):** ⚠️ *Deprecated - Use Responses API instead*
+**OpenAI Assistants (Existing):**
 ```csharp
 AIAgent agent = new OpenAIClient(apiKey)
     .GetAssistantClient()
@@ -562,20 +562,6 @@ AIAgent agent = await new PersistentAgentsClient(endpoint, credential)
     .GetAIAgentAsync(agentId);
 ```
 
-**OpenAI Responses:** *(Recommended for OpenAI)*
-```csharp
-AIAgent agent = new OpenAIClient(apiKey)
-    .GetOpenAIResponseClient(modelId)
-    .CreateAIAgent(instructions: instructions);
-```
-
-**Azure OpenAI Responses:** *(Recommended for Azure OpenAI)*
-```csharp
-AIAgent agent = new AzureOpenAIClient(endpoint, credential)
-    .GetOpenAIResponseClient(deploymentName)
-    .CreateAIAgent(instructions: instructions);
-```
-
 **A2A:**
 ```csharp
 A2ACardResolver resolver = new(new Uri(agentHost));
@@ -776,57 +762,35 @@ await foreach (var content in agent.InvokeAsync(userInput, thread))
 
 **With this Agent Framework CodeInterpreter pattern:**
 ```csharp
-using System.Text;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
 var result = await agent.RunAsync(userInput, thread);
 Console.WriteLine(result);
 
-// Get the CodeInterpreterToolCallContent (code input)
-CodeInterpreterToolCallContent? toolCallContent = result.Messages
-    .SelectMany(m => m.Contents)
-    .OfType<CodeInterpreterToolCallContent>()
-    .FirstOrDefault();
+// Extract chat response MEAI type via first level breaking glass
+var chatResponse = result.RawRepresentation as ChatResponse;
 
-if (toolCallContent?.Inputs is not null)
+// Extract underlying SDK updates via second level breaking glass
+var underlyingStreamingUpdates = chatResponse?.RawRepresentation as IEnumerable<object?> ?? [];
+
+StringBuilder generatedCode = new();
+foreach (object? underlyingUpdate in underlyingStreamingUpdates ?? [])
 {
-    DataContent? codeInput = toolCallContent.Inputs.OfType<DataContent>().FirstOrDefault();
-    if (codeInput?.HasTopLevelMediaType("text") ?? false)
+    if (underlyingUpdate is RunStepDetailsUpdate stepDetailsUpdate && stepDetailsUpdate.CodeInterpreterInput is not null)
     {
-        Console.WriteLine($"Code Input: {Encoding.UTF8.GetString(codeInput.Data.ToArray())}");
+        generatedCode.Append(stepDetailsUpdate.CodeInterpreterInput);
     }
 }
 
-// Get the CodeInterpreterToolResultContent (code output)
-CodeInterpreterToolResultContent? toolResultContent = result.Messages
-    .SelectMany(m => m.Contents)
-    .OfType<CodeInterpreterToolResultContent>()
-    .FirstOrDefault();
-
-if (toolResultContent?.Outputs is not null)
+if (!string.IsNullOrEmpty(generatedCode.ToString()))
 {
-    TextContent? resultOutput = toolResultContent.Outputs.OfType<TextContent>().FirstOrDefault();
-    if (resultOutput is not null)
-    {
-        Console.WriteLine($"Code Tool Result: {resultOutput.Text}");
-    }
-}
-
-// Getting any annotations generated by the tool
-foreach (AIAnnotation annotation in result.Messages
-    .SelectMany(m => m.Contents)
-    .SelectMany(c => c.Annotations ?? []))
-{
-    Console.WriteLine($"Annotation: {annotation}");
+    Console.WriteLine($"\n# {chatResponse?.Messages[0].Role}:Generated Code:\n{generatedCode}");
 }
 ```
 
 **Functional differences:**
-1. Code interpreter content is now available via MEAI abstractions - no breaking glass required
-2. Use `CodeInterpreterToolCallContent` to access code inputs (the generated code)
-3. Use `CodeInterpreterToolResultContent` to access code outputs (execution results)
-4. Annotations are accessible via `AIAnnotation` on content items
+1. Code interpreter output is separate from text content, not a metadata property
+2. Access code via `RunStepDetailsUpdate.CodeInterpreterInput` instead of metadata
+3. Use breaking glass pattern to access underlying SDK objects
+4. Process text content and code interpreter output independently
 </behavioral_changes>
 
 #### Provider-Specific Options Configuration
@@ -839,7 +803,7 @@ var agentOptions = new ChatClientAgentRunOptions(new ChatOptions
 {
     MaxOutputTokens = 8000,
     // Breaking glass to access provider-specific options
-    RawRepresentationFactory = (_) => new OpenAI.Responses.CreateResponseOptions()
+    RawRepresentationFactory = (_) => new OpenAI.Responses.ResponseCreationOptions()
     {
         ReasoningOptions = new()
         {
@@ -1016,8 +980,6 @@ AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential(
 
 ### 3. OpenAI Assistants Migration
 
-> ⚠️ **DEPRECATION WARNING**: The OpenAI Assistants API has been deprecated. The Agent Framework extension methods for Assistants are marked as `[Obsolete]`. **Please use the Responses API instead** (see Section 6: OpenAI Responses Migration).
-
 <configuration_changes>
 **Remove Semantic Kernel Packages:**
 ```xml
@@ -1329,7 +1291,52 @@ var result = await agent.RunAsync(userInput, thread);
 ```
 </api_changes>
 
-### 8. Unsupported Providers (Require Custom Implementation)
+### 8. A2A Migration
+
+<configuration_changes>
+**Remove Semantic Kernel Packages:**
+```xml
+<PackageReference Include="Microsoft.SemanticKernel.Agents.A2A" />
+```
+
+**Add Agent Framework Packages:**
+```xml
+<PackageReference Include="Microsoft.Agents.AI.A2A" />
+```
+</configuration_changes>
+
+<api_changes>
+**Replace this Semantic Kernel pattern:**
+```csharp
+using A2A;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.Agents;
+using Microsoft.SemanticKernel.Agents.A2A;
+
+using var httpClient = CreateHttpClient();
+var client = new A2AClient(agentUrl, httpClient);
+var cardResolver = new A2ACardResolver(url, httpClient);
+var agentCard = await cardResolver.GetAgentCardAsync();
+Console.WriteLine(JsonSerializer.Serialize(agentCard, s_jsonSerializerOptions));
+var agent = new A2AAgent(client, agentCard);
+```
+
+**With this Agent Framework pattern:**
+```csharp
+using System;
+using A2A;
+using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.A2A;
+
+// Initialize an A2ACardResolver to get an A2A agent card.
+A2ACardResolver agentCardResolver = new(new Uri(a2aAgentHost));
+
+// Create an instance of the AIAgent for an existing A2A agent specified by the agent card.
+AIAgent agent = await agentCardResolver.GetAIAgentAsync();
+```
+</api_changes>
+
+### 9. Unsupported Providers (Require Custom Implementation)
 
 <behavioral_changes>
 #### BedrockAgent Migration
@@ -1500,7 +1507,7 @@ Console.WriteLine(result);
 ```
 </behavioral_changes>
 
-### 9. Function Invocation Filtering
+### 10. Function Invocation Filtering
 
 **Invocation Context**
 
@@ -1608,4 +1615,25 @@ var filteredAgent = originalAgent
     .Build();
 ```
 
+### 11. Function Invocation Contexts
 
+**Invocation Context**
+
+Semantic Kernel's `IAutoFunctionInvocationFilter` provides a `AutoFunctionInvocationContext` where Agent Framework provides `FunctionInvocationContext` 
+
+The property mapping guide from a `AutoFunctionInvocationContext` to a `FunctionInvocationContext` is as follows:
+
+| Semantic Kernel | Agent Framework |
+| --- | --- |
+| RequestSequenceIndex | Iteration |
+| FunctionSequenceIndex | FunctionCallIndex |
+| ToolCallId | CallContent.CallId |
+| ChatMessageContent | Messages[0] |
+| ExecutionSettings | Options |
+| ChatHistory | Messages |
+| Function | Function |
+| Kernel | N/A |
+| Result | Use `return` from the delegate |
+| Terminate | Terminate |
+| CancellationToken | provided via argument to middleware delegate |
+| Arguments | Arguments |

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

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

@@ -8,17 +8,16 @@ name: dotnet-build-and-test
 on:
   workflow_dispatch:
   pull_request:
-    branches: ["main", "feature*"]
+    branches: ["main"]
   merge_group:
-    branches: ["main", "feature*"]
+    branches: ["main"]
   push:
-    branches: ["main", "feature*"]
+    branches: ["main"]
   schedule:
     - cron: "0 0 * * *" # Run at midnight UTC daily
 
 env:
   COVERAGE_THRESHOLD: 80
-  COVERAGE_FRAMEWORK: net10.0 # framework target for which we run/report code coverage
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -35,25 +34,19 @@ jobs:
       contents: read
       pull-requests: read
     outputs:
-      dotnetChanges: ${{ steps.filter.outputs.dotnet }}
-      cosmosDbChanges: ${{ steps.filter.outputs.cosmosdb }}
+      dotnetChanges: ${{ steps.filter.outputs.dotnet}}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
             dotnet:
               - 'dotnet/**'
-            cosmosdb:
-              - 'dotnet/src/Microsoft.Agents.AI.CosmosNoSql/**'
       # run only if 'dotnet' files were changed
       - name: dotnet tests
         if: steps.filter.outputs.dotnet == 'true'
         run: echo "Dotnet file"
-      - name: dotnet CosmosDB tests
-        if: steps.filter.outputs.cosmosdb == 'true'
-        run: echo "Dotnet CosmosDB changes"
       # run only if not 'dotnet' files were changed
       - name: not dotnet tests
         if: steps.filter.outputs.dotnet != 'true'
@@ -66,36 +59,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { targetFramework: "net10.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
-          - { targetFramework: "net9.0", os: "windows-latest", configuration: Debug }
-          - { targetFramework: "net8.0", os: "ubuntu-latest", configuration: Release }
+          - { targetFramework: "net9.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
+          - { targetFramework: "net9.0", os: "ubuntu-latest", configuration: Debug }
+          - { targetFramework: "net9.0", os: "windows-latest", configuration: Release }
           - { targetFramework: "net472", os: "windows-latest", configuration: Release, integration-tests: true, environment: "integration" }
 
     runs-on: ${{ matrix.os }}
     environment: ${{ matrix.environment }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
-            persist-credentials: false
-            sparse-checkout: |
-              .
-              .github
-              dotnet
-              python
-              workflow-samples
-              
-      # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
-      - name: Start Azure Cosmos DB Emulator
-        if: ${{ runner.os == 'Windows' && (needs.paths-filter.outputs.cosmosDbChanges == 'true' || (github.event_name != 'pull_request' && matrix.integration-tests)) }}
-        shell: pwsh
-        run: |
-          Write-Host "Launching Azure Cosmos DB Emulator"
-          Import-Module "$env:ProgramFiles\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
-          Start-CosmosDbEmulator -NoUI -Key "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-          echo "COSMOS_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
+          persist-credentials: false
+          sparse-checkout: |
+            .
+            .github
+            dotnet
+            python
+            workflow-samples
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v5.0.1
+        uses: actions/setup-dotnet@v5.0.0
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
       - name: Build dotnet solutions
@@ -139,8 +122,8 @@ jobs:
           popd
           popd
           rm -rf "$TEMP_DIR"
-          
-      - name: Run Unit Tests
+
+      - name: Run Unit Tests Windows
         shell: bash
         run: |
           export UT_PROJECTS=$(find ./dotnet -type f -name "*.UnitTests.csproj" | tr '\n' ' ')
@@ -150,20 +133,12 @@ jobs:
             
             # Check if the project supports the target framework
             if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              if [[ "${{ matrix.targetFramework }}" == "${{ env.COVERAGE_FRAMEWORK }}" ]]; then
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
-              else
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
-              fi
+              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
             else
               echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
             fi
           done
-        env:
-          # Cosmos DB Emulator connection settings
-          COSMOSDB_ENDPOINT: https://localhost:8081
-          COSMOSDB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
-
+      
       - name: Log event name and matrix integration-tests
         shell: bash 
         run: echo "github.event_name:${{ github.event_name }} matrix.integration-tests:${{ matrix.integration-tests }} github.event.action:${{ github.event.action }} github.event.pull_request.merged:${{ github.event.pull_request.merged }}" 
@@ -176,14 +151,6 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-        # This setup action is required for both Durable Task and Azure Functions integration tests.
-        # We only run it on Ubuntu since the Durable Task and Azure Functions features are not available
-        # on .NET Framework (net472) which is what we use the Windows runner for.
-      - name: Set up Durable Task and Azure Functions Integration Test Emulators
-        if: github.event_name != 'pull_request' && matrix.integration-tests && matrix.os == 'ubuntu-latest'
-        uses: ./.github/actions/azure-functions-integration-setup
-        id: azure-functions-setup
-
       - name: Run Integration Tests
         shell: bash
         if: github.event_name != 'pull_request' && matrix.integration-tests
@@ -201,16 +168,10 @@ jobs:
             fi
           done
         env:
-          # Cosmos DB Emulator connection settings
-          COSMOSDB_ENDPOINT: https://localhost:8081
-          COSMOSDB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
           # OpenAI Models
           OpenAI__ApiKey: ${{ secrets.OPENAI__APIKEY }}
           OpenAI__ChatModelId: ${{ vars.OPENAI__CHATMODELID }}
           OpenAI__ChatReasoningModelId: ${{ vars.OPENAI__CHATREASONINGMODELID }}
-          # Azure OpenAI Models
-          AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
-          AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
           # Azure AI Foundry
           AzureAI__Endpoint: ${{ secrets.AZUREAI__ENDPOINT }}
           AzureAI__DeploymentName: ${{ vars.AZUREAI__DEPLOYMENTNAME }}
@@ -222,22 +183,19 @@ jobs:
 
       # Generate test reports and check coverage
       - name: Generate test reports
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.5.1
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.4.18
         with:
           reports: "./TestResults/Coverage/**/coverage.cobertura.xml"
           targetdir: "./TestResults/Reports"
           reporttypes: "HtmlInline;JsonSummary"
 
       - name: Upload coverage report artifact
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: CoverageReport-${{ matrix.os }}-${{ matrix.targetFramework }}-${{ matrix.configuration }} # Artifact name
           path: ./TestResults/Reports # Directory containing files to upload
 
       - name: Check coverage
-        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
         shell: pwsh
         run: .github/workflows/dotnet-check-coverage.ps1 -JsonReportPath "TestResults/Reports/Summary.json" -CoverageThreshold $env:COVERAGE_THRESHOLD
 

.github/workflows/dotnet-format.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { dotnet: "10.0", configuration: Release, os: ubuntu-latest }
+          - { dotnet: "9.0", configuration: Release, os: ubuntu-latest }
 
     runs-on: ${{ matrix.os }}
     env:
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/label-issues.yml

@@ -45,58 +45,19 @@ jobs:
               labels.push("triage")
             }
 
-            // Helper function to extract field value from issue form body
-            // Issue forms format fields as: ### Field Name\n\nValue
-            function getFormFieldValue(body, fieldName) {
-              if (!body) return null
-              const regex = new RegExp(`###\\s*${fieldName}\\s*\\n\\n([^\\n#]+)`, 'i')
-              const match = body.match(regex)
-              return match ? match[1].trim() : null
+            // Check if the body or the title contains the word 'python' (case-insensitive)
+            if ((body != null && body.match(/python/i)) || (title != null && title.match(/python/i))) {
+              // Add the 'python' label to the array
+              labels.push("python")
             }
 
-            // Check for language from issue form dropdown first
-            const languageField = getFormFieldValue(body, 'Language')
-            let languageLabelAdded = false
-
-            if (languageField) {
-              if (languageField === 'Python') {
-                labels.push("python")
-                languageLabelAdded = true
-              } else if (languageField === '.NET') {
-                labels.push(".NET")
-                languageLabelAdded = true
-              }
-              // 'None / Not Applicable' - don't add any language label
-            }
-
-            // Fallback: Check if the body or the title contains the word 'python' (case-insensitive)
-            // Only if language wasn't already determined from the form field
-            if (!languageLabelAdded) {
-              if ((body != null && body.match(/python/i)) || (title != null && title.match(/python/i))) {
-                // Add the 'python' label to the array
-                labels.push("python")
-              }
-
-              // Check if the body or the title contains the words 'dotnet', '.net', 'c#' or 'csharp' (case-insensitive)
-              if ((body != null && body.match(/\.net/i)) || (title != null && title.match(/\.net/i)) ||
-                  (body != null && body.match(/dotnet/i)) || (title != null && title.match(/dotnet/i)) ||
-                  (body != null && body.match(/C#/i)) || (title != null && title.match(/C#/i)) ||
-                  (body != null && body.match(/csharp/i)) || (title != null && title.match(/csharp/i))) {
-                // Add the '.NET' label to the array
-                labels.push(".NET")
-              }
-            }
-
-            // Check for issue type from issue form dropdown
-            const issueTypeField = getFormFieldValue(body, 'Type of Issue')
-            if (issueTypeField) {
-              if (issueTypeField === 'Bug') {
-                labels.push("bug")
-              } else if (issueTypeField === 'Feature Request') {
-                labels.push("enhancement")
-              } else if (issueTypeField === 'Question') {
-                labels.push("question")
-              }
+            // Check if the body or the title contains the words 'dotnet', '.net', 'c#' or 'csharp' (case-insensitive)
+            if ((body != null && body.match(/.net/i)) || (title != null && title.match(/.net/i)) ||
+                (body != null && body.match(/dotnet/i)) || (title != null && title.match(/dotnet/i)) ||
+                (body != null && body.match(/C#/i)) || (title != null && title.match(/C#/i)) ||
+                (body != null && body.match(/csharp/i)) || (title != null && title.match(/csharp/i))) {
+              // Add the '.NET' label to the array
+              labels.push(".NET")
             }
 
             // Add the labels to the issue (only if there are labels to add)

.github/workflows/markdown-link-check.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     # check out the latest version of the code
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
 

.github/workflows/python-code-quality.yml

@@ -27,9 +27,7 @@ jobs:
     env:
       UV_PYTHON: ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v5
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -39,7 +37,7 @@ jobs:
         env:
           # Configure a constant location for the uv cache
           UV_CACHE_DIR: /tmp/.uv-cache
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ matrix.python-version }}|${{ hashFiles('python/.pre-commit-config.yaml') }}
@@ -48,6 +46,4 @@ jobs:
         with:
           extra_args: --config python/.pre-commit-config.yaml --all-files
       - name: Run Mypy
-        env:
-          GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref || github.base_ref || 'main' }}
-        run: uv run poe ci-mypy
+        run: uv run poe mypy

.github/workflows/python-docs.yml

@@ -24,7 +24,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up uv
         uses: astral-sh/setup-uv@v7
         with:

.github/workflows/python-lab-tests.yml

@@ -24,7 +24,7 @@ jobs:
     outputs:
       pythonChanges: ${{ steps.filter.outputs.python}}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -59,7 +59,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Set up python and install the project
         id: python-setup

.github/workflows/python-merge-tests.yml

@@ -28,7 +28,7 @@ jobs:
     outputs:
       pythonChanges: ${{ steps.filter.outputs.python}}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -66,16 +66,11 @@ jobs:
       AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
       AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
       LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
-      # For Azure Functions integration tests
-      FUNCTIONS_WORKER_RUNTIME: "python"
-      DURABLE_TASK_SCHEDULER_CONNECTION_STRING: "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None"
-      AzureWebJobsStorage: "UseDevelopmentStorage=true"
-
     defaults:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -92,9 +87,6 @@ jobs:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Set up Azure Functions Integration Test Emulators
-        uses: ./.github/actions/azure-functions-integration-setup
-        id: azure-functions-setup
       - name: Test with pytest
         timeout-minutes: 10
         run: uv run poe all-tests -n logical --dist loadfile --dist worksteal --timeout 300 --retries 3 --retry-delay 10
@@ -135,7 +127,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -154,7 +146,7 @@ jobs:
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       - name: Test with pytest
         timeout-minutes: 10
-        run: uv run --directory packages/azure-ai poe integration-tests -n logical --dist loadfile --dist worksteal --timeout 300 --retries 3 --retry-delay 10
+        run: uv run poe azure-ai-tests -n logical --dist loadfile --dist worksteal --timeout 300 --retries 3 --retry-delay 10
         working-directory: ./python
       - name: Test Azure AI samples
         timeout-minutes: 10

.github/workflows/python-release.yml

@@ -23,7 +23,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup

.github/workflows/python-test-coverage-report.yml

@@ -19,9 +19,9 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Download coverage report
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           run-id: ${{ github.event.workflow_run.id }}
@@ -39,7 +39,7 @@ jobs:
           echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
       - name: Pytest coverage comment
         id: coverageComment
-        uses: MishaKav/pytest-coverage-comment@v1.2.0
+        uses: MishaKav/pytest-coverage-comment@v1.1.57
         with:
           github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           issue-number: ${{ env.PR_NUMBER }}

.github/workflows/python-test-coverage.yml

@@ -20,7 +20,7 @@ jobs:
     env:
       UV_PYTHON: "3.10"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       # Save the PR number to a file since the workflow_run event
       # in the coverage report workflow does not have access to it
       - name: Save PR number
@@ -38,7 +38,7 @@ jobs:
       - name: Run all tests with coverage report
         run: uv run poe all-tests-cov --cov-report=xml:python-coverage.xml -q --junitxml=pytest.xml
       - name: Upload coverage report
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           path: |
             python/python-coverage.xml

.github/workflows/python-tests.yml

@@ -27,7 +27,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup

.gitignore

@@ -204,20 +204,6 @@ agents.md
 # AI
 .claude/
 WARP.md
-**/memory-bank/
-**/projectBrief.md
-
-# Azurite storage emulator files
-*/__azurite_db_blob__.json
-*/__azurite_db_blob_extent__.json
-*/__azurite_db_queue__.json
-*/__azurite_db_queue_extent__.json
-*/__azurite_db_table__.json
-*/__blobstorage__/
-*/__queuestorage__/
-
-# Azure Functions local settings
-local.settings.json
 
 # Frontend
 **/frontend/node_modules/
@@ -225,4 +211,4 @@ local.settings.json
 **/frontend/dist/
 
 # Database files
-*.db
+*.db

README.md

@@ -48,8 +48,6 @@ dotnet add package Microsoft.Agents.AI
 - **[Migration from Semantic Kernel](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-semantic-kernel)** - Guide to migrate from Semantic Kernel
 - **[Migration from AutoGen](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-autogen)** - Guide to migrate from AutoGen
 
-Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-community-office-hours) or ask questions in our [Discord channel](https://discord.gg/b5zjErwbQM) to get help from the team and other users.
-
 ### ✨ **Highlights**
 
 - **Graph-based Workflows**: Connect agents and deterministic functions using data flows with streaming, checkpointing, human-in-the-loop, and time-travel capabilities

TRANSPARENCY_FAQ.md

@@ -42,9 +42,9 @@ Microsoft Agent Framework relies on existing LLMs. Using the framework retains c
 
 **Framework-Specific Limitations**:
 
-- **Platform Requirements**: Python 3.10+ required, specific .NET versions (.NET 8.0, 9.0, 10.0, netstandard2.0, net472)
+- **Platform Requirements**: Python 3.10+ required, specific .NET versions (.NET 8.0, 9.0, netstandard2.0, net472)
 - **API Dependencies**: Requires proper configuration of LLM provider keys and endpoints
-- **Orchestration Features**: Advanced orchestration patterns including GroupChat, Sequential, and Concurrent workflows are now available in both Python and .NET implementations. See the respective language documentation for examples.
+- **Orchestration Features**: Advanced orchestration patterns like GroupChat, Sequential, and Concurrent orchestrations are "coming soon" for Python implementation
 - **Privacy and Data Protection**: The framework allows for human participation in conversations between agents. It is important to ensure that user data and conversations are protected and that developers use appropriate measures to safeguard privacy.
 - **Accountability and Transparency**: The framework involves multiple agents conversing and collaborating, it is important to establish clear accountability and transparency mechanisms. Users should be able to understand and trace the decision-making process of the agents involved in order to ensure accountability and address any potential issues or biases.
 - **Security & unintended consequences**: The use of multi-agent conversations and automation in complex tasks may have unintended consequences. Especially, allowing agents to make changes in external environments through tool calls or function execution could pose significant risks. Developers should carefully consider the potential risks and ensure that appropriate safeguards are in place to prevent harm or negative outcomes, including keeping a human in the loop for decision making.

agent-samples/README.md

@@ -1,3 +0,0 @@
-# Declarative Agents
-
-This folder contains sample agent definitions that can be run using the declarative agent support, for python see the [declarative agent python sample folder](../python/samples/getting_started/declarative/).

agent-samples/azure/AzureOpenAI.yaml

@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: =Env.AZURE_OPENAI_DEPLOYMENT_NAME
-    provider: AzureOpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
-        type:
-            kind: string
-            required: true
-            description: The type of the response.

agent-samples/azure/AzureOpenAIAssistants.yaml

@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Assistants as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Assistants
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.

agent-samples/azure/AzureOpenAIChat.yaml

@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.

agent-samples/azure/AzureOpenAIResponses.yaml

@@ -1,25 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Responses as the type in your response.
-model:
-    id: gpt-4o-mini
-    provider: AzureOpenAI
-    apiType: Responses
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.

agent-samples/chatclient/Assistant.yaml

@@ -1,18 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format.
-model:
-    options:
-        temperature: 0.9
-        topP: 0.95
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.

agent-samples/chatclient/GetWeather.yaml

@@ -1,29 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions using the tools provided.
-model:
-    options:
-        temperature: 0.9
-        topP: 0.95
-        allowMultipleToolCalls: true
-        chatToolMode: auto
-tools:
-  - kind: function
-    name: GetWeather
-    description: Get the weather for a given location.
-    bindings:
-      get_weather: get_weather
-    parameters:
-      properties:
-        location:
-          kind: string
-          description: The city and state, e.g. San Francisco, CA
-          required: true
-        unit:
-          kind: string
-          description: The unit of temperature. Possible values are 'celsius' and 'fahrenheit'.
-          required: false
-          enum:
-            - celsius
-            - fahrenheit

agent-samples/foundry/FoundryAgent.yaml

@@ -1,22 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format.
-model:
-    id: gpt-4.1-mini
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: Remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.

agent-samples/foundry/MicrosoftLearnAgent.yaml

@@ -1,21 +0,0 @@
-kind: Prompt
-name: MicrosoftLearnAgent
-description: Microsoft Learn Agent
-instructions: You answer questions by searching the Microsoft Learn content only.
-model:
-    id: =Env.AZURE_FOUNDRY_PROJECT_MODEL_ID
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-tools:
-  - kind: mcp
-    name: microsoft_learn
-    description: Get information from Microsoft Learn.
-    url: https://learn.microsoft.com/api/mcp
-    approvalMode:
-      kind: never
-    allowedTools:
-      - microsoft_docs_search

agent-samples/foundry/PersistentAgent.yaml

@@ -1,22 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format.
-model:
-    id: =Env.AZURE_FOUNDRY_PROJECT_MODEL_ID
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: remote
-        endpoint: =Env.AZURE_FOUNDRY_PROJECT_ENDPOINT
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.

agent-samples/openai/OpenAI.yaml

@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions is the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: =Env.OPENAI_MODEL
-    provider: OpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: key
-        key: =Env.OPENAI_API_KEY
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
-        type:
-            kind: string
-            required: true
-            description: The type of the response.

agent-samples/openai/OpenAIAssistants.yaml

@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Assistants as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Assistants
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: ApiKey
-        key: =Env.OPENAI_API_KEY
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.

agent-samples/openai/OpenAIChat.yaml

@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Chat as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Chat
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: ApiKey
-        key: =Env.OPENAI_API_KEY
-outputSchema:
-    properties:
-        language:
-            type: string
-            required: true
-            description: The language of the answer.
-        answer:
-            type: string
-            required: true
-            description: The answer text.
-        type:
-            type: string
-            required: true
-            description: The type of the response.

agent-samples/openai/OpenAIResponses.yaml

@@ -1,28 +0,0 @@
-kind: Prompt
-name: Assistant
-description: Helpful assistant
-instructions: You are a helpful assistant. You answer questions in the language specified by the user. You return your answers in a JSON format. You must include Responses as the type in your response.
-model:
-    id: gpt-4.1-mini
-    provider: OpenAI
-    apiType: Responses
-    options:
-        temperature: 0.9
-        topP: 0.95
-    connection:
-        kind: key
-        apiKey: =Env.OPENAI_APIKEY
-outputSchema:
-    properties:
-        language:
-            kind: string
-            required: true
-            description: The language of the answer.
-        answer:
-            kind: string
-            required: true
-            description: The answer text.
-        type:
-            kind: string
-            required: true
-            description: The type of the response.

docs/FAQS.md

@@ -23,23 +23,23 @@ To download nightly builds follow the following steps:
     <configuration>
       <packageSources>
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="GitHubMicrosoft" value="https://nuget.pkg.github.com/microsoft/index.json" />
+        <add key="github" value="https://nuget.pkg.github.com/microsoft/index.json" />
       </packageSources>
     
       <packageSourceMapping>
         <packageSource key="nuget.org">
           <package pattern="*" />
         </packageSource>
-        <packageSource key="GitHubMicrosoft">
+        <packageSource key="github">
           <package pattern="*nightly"/>
         </packageSource>
       </packageSourceMapping>
     
       <packageSourceCredentials>
-        <GitHubMicrosoft>
-          <add key="Username" value="<Your GitHub Id>" />
-          <add key="ClearTextPassword" value="<Your Personal Access Token>" />
-        </GitHubMicrosoft>
+        <github>
+            <add key="Username" value="<Your GitHub Id>" />
+            <add key="ClearTextPassword" value="<Your Personal Access Token>" />
+          </github>
       </packageSourceCredentials>
     </configuration>
     ```

docs/decisions/0001-agent-run-response.md

@@ -64,7 +64,7 @@ Approaches observed from the compared SDKs:
 | AutoGen | **Approach 1** Separates messages into Agent-Agent (maps to Primary) and Internal (maps to Secondary) and these are returned as separate properties on the agent response object.  See [types of messages](https://microsoft.github.io/autogen/stable/user-guide/agentchat-user-guide/tutorial/messages.html#types-of-messages) and [Response](https://microsoft.github.io/autogen/stable/reference/python/autogen_agentchat.base.html#autogen_agentchat.base.Response) | **Approach 2** Returns a stream of internal events and the last item is a Response object. See [ChatAgent.on_messages_stream](https://microsoft.github.io/autogen/stable/reference/python/autogen_agentchat.base.html#autogen_agentchat.base.ChatAgent.on_messages_stream) |
 | OpenAI Agent SDK | **Approach 1** Separates new_items (Primary+Secondary) from final output (Primary) as separate properties on the [RunResult](https://github.com/openai/openai-agents-python/blob/main/src/agents/result.py#L39) | **Approach 1** Similar to non-streaming, has a way of streaming updates via a method on the response object which includes all data, and then a separate final output property on the response object which is populated only when the run is complete. See [RunResultStreaming](https://github.com/openai/openai-agents-python/blob/main/src/agents/result.py#L136) |
 | Google ADK | **Approach 2** [Emits events](https://google.github.io/adk-docs/runtime/#step-by-step-breakdown) with [FinalResponse](https://github.com/google/adk-java/blob/main/core/src/main/java/com/google/adk/events/Event.java#L232) true (Primary) / false (Secondary) and callers have to filter out those with false to get just the final response message | **Approach 2** Similar to non-streaming except [events](https://google.github.io/adk-docs/runtime/#streaming-vs-non-streaming-output-partialtrue) are emitted with [Partial](https://github.com/google/adk-java/blob/main/core/src/main/java/com/google/adk/events/Event.java#L133) true to indicate that they are streaming messages. A final non partial event is also emitted. |
-| AWS (Strands) | **Approach 3** Returns an [AgentResult](https://strandsagents.com/latest/documentation/docs/api-reference/python/agent/agent_result/) (Primary) with messages and a reason for the run's completion. | **Approach 2** [Streams events](https://strandsagents.com/latest/documentation/docs/api-reference/python/agent/agent/#strands.agent.agent.Agent.stream_async) (Primary+Secondary) including, response text, current_tool_use, even data from "callbacks" (strands plugins) |
+| AWS (Strands) | **Approach 3** Returns an [AgentResult](https://strandsagents.com/latest/api-reference/agent/#strands.agent.agent_result.AgentResult) (Primary) with messages and a reason for the run's completion. | **Approach 2** [Streams events](https://strandsagents.com/latest/api-reference/agent/#strands.agent.agent.Agent.stream_async) (Primary+Secondary) including, response text, current_tool_use, even data from "callbacks" (strands plugins) |
 | LangGraph | **Approach 2** A mixed list of all [messages](https://langchain-ai.github.io/langgraph/agents/run_agents/#output-format) | **Approach 2** A mixed list of all [messages](https://langchain-ai.github.io/langgraph/agents/run_agents/#output-format) |
 | Agno | **Combination of various approaches** Returns a [RunResponse](https://docs.agno.com/reference/agents/run-response) object with text content, messages (essentially chat history including inputs and instructions), reasoning and thinking text properties. Secondary events could potentially be extracted from messages. | **Approach 2** Returns [RunResponseEvent](https://docs.agno.com/reference/agents/run-response#runresponseevent-types-and-attributes) objects including tool call, memory update, etc, information, where the [RunResponseCompletedEvent](https://docs.agno.com/reference/agents/run-response#runresponsecompletedevent) has similar properties to RunResponse|
 | A2A | **Approach 3** Returns a [Task or Message](https://a2aproject.github.io/A2A/latest/specification/#71-messagesend) where the message is the final result (Primary) and task is a reference to a long running process. | **Approach 2** Returns a [stream](https://a2aproject.github.io/A2A/latest/specification/#72-messagestream) that contains task updates (Secondary) and a final message (Primary) |
@@ -495,8 +495,8 @@ We need to decide what AIContent types, each agent response type will be mapped
 | SDK | Structured Outputs support |
 |-|-|
 | AutoGen | **Approach 1** Supports [configuring an agent](https://microsoft.github.io/autogen/stable/user-guide/agentchat-user-guide/tutorial/agents.html#structured-output) at agent creation. |
-| Google ADK | **Approach 1** Both [input and output schemas can be specified for LLM Agents](https://google.github.io/adk-docs/agents/llm-agents/#structuring-data-input_schema-output_schema-output_key) at construction time. This option is specific to this agent type and other agent types do not necessarily support |
-| AWS (Strands) | **Approach 2** Supports a special invocation method called [structured_output](https://strandsagents.com/latest/documentation/docs/api-reference/python/agent/agent/#strands.agent.agent.Agent.structured_output) |
+| Google ADK | **Approach 1** Both [input and output shemas can be specified for LLM Agents](https://google.github.io/adk-docs/agents/llm-agents/#structuring-data-input_schema-output_schema-output_key) at construction time. This option is specific to this agent type and other agent types do not necessarily support |
+| AWS (Strands) | **Approach 2** Supports a special invocation method called [structured_output](https://strandsagents.com/latest/api-reference/agent/#strands.agent.agent.Agent.structured_output) |
 | LangGraph | **Approach 1** Supports [configuring an agent](https://langchain-ai.github.io/langgraph/agents/agents/?h=structured#6-configure-structured-output) at agent construction time, and a [structured response](https://langchain-ai.github.io/langgraph/agents/run_agents/#output-format) can be retrieved as a special property on the agent response |
 | Agno | **Approach 1** Supports [configuring an agent](https://docs.agno.com/examples/getting-started/structured-output) at agent construction time |
 | A2A | **Informal Approach 2** Doesn't formally support schema negotiation, but [hints can be provided via metadata](https://a2a-protocol.org/latest/specification/#97-structured-data-exchange-requesting-and-providing-json) at invocation time |
@@ -508,7 +508,7 @@ We need to decide what AIContent types, each agent response type will be mapped
 |-|-|
 | AutoGen | Supports a [stop reason](https://microsoft.github.io/autogen/stable/reference/python/autogen_agentchat.base.html#autogen_agentchat.base.TaskResult.stop_reason) which is a freeform text string |
 | Google ADK | [No equivalent present](https://github.com/google/adk-python/blob/main/src/google/adk/events/event.py) |
-| AWS (Strands) | Exposes a [stop_reason](https://strandsagents.com/latest/documentation/docs/api-reference/python/types/event_loop/#strands.types.event_loop.StopReason) property on the [AgentResult](https://strandsagents.com/latest/documentation/docs/api-reference/python/agent/agent_result/) class with options that are tied closely to LLM operations. |
+| AWS (Strands) | Exposes a [stop_reason](https://strandsagents.com/latest/api-reference/types/#strands.types.event_loop.StopReason) property on the [AgentResult](https://strandsagents.com/latest/api-reference/agent/#strands.agent.agent_result.AgentResult) class with options that are tied closely to LLM operations. |
 | LangGraph | No equivalent present, output contains only [messages](https://langchain-ai.github.io/langgraph/agents/run_agents/#output-format) |
 | Agno | [No equivalent present](https://docs.agno.com/reference/agents/run-response) |
 | A2A | No equivalent present, response only contains a [message](https://a2a-protocol.org/latest/specification/#64-message-object) or [task](https://a2a-protocol.org/latest/specification/#61-task-object). |

docs/features/durable-agents/durable-agents-ttl.md

@@ -1,147 +0,0 @@
-# Time-To-Live (TTL) for durable agent sessions
-
-## Overview
-
-The durable agents automatically maintain conversation history and state for each session. Without automatic cleanup, this state can accumulate indefinitely, consuming storage resources and increasing costs. The Time-To-Live (TTL) feature provides automatic cleanup of idle agent sessions, ensuring that sessions are automatically deleted after a period of inactivity.
-
-## What is TTL?
-
-Time-To-Live (TTL) is a configurable duration that determines how long an agent session state will be retained after its last interaction. When an agent session is idle (no messages sent to it) for longer than the TTL period, the session state is automatically deleted. Each new interaction with an agent resets the TTL timer, extending the session's lifetime.
-
-## Benefits
-
-- **Automatic cleanup**: No manual intervention required to clean up idle agent sessions
-- **Cost optimization**: Reduces storage costs by automatically removing unused session state
-- **Resource management**: Prevents unbounded growth of agent session state in storage
-- **Configurable**: Set TTL globally or per-agent type to match your application's needs
-
-## Configuration
-
-TTL can be configured at two levels:
-
-1. **Global default TTL**: Applies to all agent sessions unless overridden
-2. **Per-agent type TTL**: Overrides the global default for specific agent types
-
-Additionally, you can configure a **minimum deletion delay** that controls how frequently deletion operations are scheduled. The default value is 5 minutes, and the maximum allowed value is also 5 minutes.
-
-> [!NOTE]
-> Reducing the minimum deletion delay below 5 minutes can be useful for testing or for ensuring rapid cleanup of short-lived agent sessions. However, this can also increase the load on the system and should be used with caution.
-
-### Default values
-
-- **Default TTL**: 14 days
-- **Minimum TTL deletion delay**: 5 minutes (maximum allowed value, subject to change in future releases)
-
-### Configuration examples
-
-#### .NET
-
-```csharp
-// Configure global default TTL and minimum signal delay
-services.ConfigureDurableAgents(
-    options =>
-    {
-        // Set global default TTL to 7 days
-        options.DefaultTimeToLive = TimeSpan.FromDays(7);
-
-        // Add agents (will use global default TTL)
-        options.AddAIAgent(myAgent);
-    });
-
-// Configure per-agent TTL
-services.ConfigureDurableAgents(
-    options =>
-    {
-        options.DefaultTimeToLive = TimeSpan.FromDays(14); // Global default
-        
-        // Agent with custom TTL of 1 day
-        options.AddAIAgent(shortLivedAgent, timeToLive: TimeSpan.FromDays(1));
-        
-        // Agent with custom TTL of 90 days
-        options.AddAIAgent(longLivedAgent, timeToLive: TimeSpan.FromDays(90));
-        
-        // Agent using global default (14 days)
-        options.AddAIAgent(defaultAgent);
-    });
-
-// Disable TTL for specific agents by setting TTL to null
-services.ConfigureDurableAgents(
-    options =>
-    {
-        options.DefaultTimeToLive = TimeSpan.FromDays(14);
-        
-        // Agent with no TTL (never expires)
-        options.AddAIAgent(permanentAgent, timeToLive: null);
-    });
-```
-
-## How TTL works
-
-The following sections describe how TTL works in detail.
-
-### Expiration tracking
-
-Each agent session maintains an expiration timestamp in its internally managed state that is updated whenever the session processes a message:
-
-1. When a message is sent to an agent session, the expiration time is set to `current time + TTL`
-2. The runtime schedules a delete operation for the expiration time (subject to minimum delay constraints)
-3. When the delete operation runs, if the current time is past the expiration time, the session state is deleted. Otherwise, the delete operation is rescheduled for the next expiration time.
-
-### State deletion
-
-When an agent session expires, its entire state is deleted, including:
-
-- Conversation history
-- Any custom state data
-- Expiration timestamps
-
-After deletion, if a message is sent to the same agent session, a new session is created with a fresh conversation history.
-
-## Behavior examples
-
-The following examples illustrate how TTL works in different scenarios.
-
-### Example 1: Agent session expires after TTL
-
-1. Agent configured with 30-day TTL
-2. User sends message at Day 0 → agent session created, expiration set to Day 30
-3. No further messages sent
-4. At Day 30 → Agent session is deleted
-5. User sends message at Day 31 → New agent session created with fresh conversation history
-
-### Example 2: TTL reset on interaction
-
-1. Agent configured with 30-day TTL
-2. User sends message at Day 0 → agent session created, expiration set to Day 30
-3. User sends message at Day 15 → Expiration reset to Day 45
-4. User sends message at Day 40 → Expiration reset to Day 70
-5. Agent session remains active as long as there are regular interactions
-
-## Logging
-
-The TTL feature includes comprehensive logging to track state changes:
-
-- **Expiration time updated**: Logged when TTL expiration time is set or updated
-- **Deletion scheduled**: Logged when a deletion check signal is scheduled
-- **Deletion check**: Logged when a deletion check operation runs
-- **Session expired**: Logged when an agent session is deleted due to expiration
-- **TTL rescheduled**: Logged when a deletion signal is rescheduled
-
-These logs help monitor TTL behavior and troubleshoot any issues.
-
-## Best practices
-
-1. **Choose appropriate TTL values**: Balance between storage costs and user experience. Too short TTLs may delete active sessions, while too long TTLs may accumulate unnecessary state.
-
-2. **Use per-agent TTLs**: Different agents may have different usage patterns. Configure TTLs per-agent based on expected session lifetimes.
-
-3. **Monitor expiration logs**: Review logs to understand TTL behavior and adjust configuration as needed.
-
-4. **Test with short TTLs**: During development, use short TTLs (e.g., minutes) to verify TTL behavior without waiting for long periods.
-
-## Limitations
-
-- TTL is based on wall-clock time, not activity time. The expiration timer starts from the last message timestamp.
-- Deletion checks are durably scheduled operations and may have slight delays depending on system load.
-- Once an agent session is deleted, its conversation history cannot be recovered.
-- TTL deletion requires at least one worker to be available to process the deletion operation message.

dotnet/.editorconfig

@@ -209,7 +209,6 @@ dotnet_diagnostic.CA2000.severity = none # Call System.IDisposable.Dispose on ob
 dotnet_diagnostic.CA2225.severity = none # Operator overloads have named alternates
 dotnet_diagnostic.CA2227.severity = none # Change to be read-only by removing the property setter
 dotnet_diagnostic.CA2249.severity = suggestion # Consider using 'Contains' method instead of 'IndexOf' method
-dotnet_diagnostic.CA2252.severity = none # Requires preview
 dotnet_diagnostic.CA2253.severity = none # Named placeholders in the logging message template should not be comprised of only numeric characters
 dotnet_diagnostic.CA2253.severity = none # Named placeholders in the logging message template should not be comprised of only numeric characters
 dotnet_diagnostic.CA2263.severity = suggestion # Use generic overload

dotnet/Directory.Build.props

@@ -3,14 +3,17 @@
     <!-- Default properties inherited by all projects. Projects can override. -->
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>10.0-all</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <AnalysisLevel>latest</AnalysisLevel>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>13</LangVersion>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn);NU5128;CS8002</NoWarn>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworksCore>net10.0;net9.0;net8.0</TargetFrameworksCore>
-    <TargetFrameworks>$(TargetFrameworksCore);netstandard2.0;net472</TargetFrameworks>
+    <ProjectsCoreTargetFrameworks>net9.0;net8.0</ProjectsCoreTargetFrameworks>
+    <ProjectsDebugCoreTargetFrameworks>net9.0</ProjectsDebugCoreTargetFrameworks>
+    <ProjectsTargetFrameworks>net9.0;net8.0;netstandard2.0;net472</ProjectsTargetFrameworks>
+    <ProjectsDebugTargetFrameworks>net9.0;net472</ProjectsDebugTargetFrameworks>
     <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
     <Configurations>Debug;Release;Publish</Configurations>
   </PropertyGroup>

dotnet/Directory.Build.targets

@@ -5,7 +5,7 @@
   <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
   <!-- Only run 'dotnet format' on dev machines, Release builds. Skip on GitHub Actions -->
   <!-- as this runs in its own Actions job. -->
-  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' ">
+  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' AND '$(TargetFramework)' == '$(ProjectsDebugTargetFrameworks)'">
     <Message Text="Running dotnet format" Importance="high" />
     <Exec Command="dotnet format --no-restore -v diag $(ProjectFileName)" />
   </Target>

dotnet/Directory.Packages.props

@@ -7,46 +7,34 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Aspire -->
-    <AspireAppHostSdkVersion>13.0.2</AspireAppHostSdkVersion>
+    <AspireAppHostSdkVersion>9.5.2</AspireAppHostSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->
-    <PackageVersion Include="Anthropic" Version="12.0.0" />
-    <PackageVersion Include="Anthropic.Foundry" Version="0.1.0" />
-    <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
+    <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="9.5.1-preview.1.25502.11" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
-    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
+    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0" />
     <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.Projects" Version="1.2.0-beta.5" />
-    <PackageVersion Include="Azure.AI.Projects.OpenAI" Version="1.0.0-beta.5" />
-    <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.8" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.7" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.17.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
-    <!-- Google Gemini  -->
-    <PackageVersion Include="Google.GenAI" Version="0.6.0" />
-    <PackageVersion Include="Mscc.GenerativeAI.Microsoft" Version="2.9.3" />
-    <!-- Microsoft.Azure.* -->
-    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.54.0" />
-    <!-- Newtonsoft.Json -->
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <!-- System.* -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageVersion Include="System.ClientModel" Version="1.8.1" />
-    <PackageVersion Include="System.CodeDom" Version="10.0.0" />
-    <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.7.0" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.10" />
+    <PackageVersion Include="System.Collections.Immutable" Version="9.0.10" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.1" />
-    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0" />
-    <PackageVersion Include="System.Net.Http.Json" Version="10.0.0" />
-    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.1" />
-    <PackageVersion Include="System.Threading.Channels" Version="10.0.1" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.10" />
+    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="System.Net.Http.Json" Version="9.0.10" />
+    <PackageVersion Include="System.Net.ServerSentEvents" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
+    <PackageVersion Include="System.Threading.Channels" Version="9.0.10" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
-    <PackageVersion Include="System.Net.Security" Version="4.3.2" />
     <!-- OpenTelemetry -->
     <PackageVersion Include="OpenTelemetry" Version="1.13.1" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.13.1" />
@@ -56,95 +44,78 @@
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
     <!-- Microsoft.AspNetCore.* -->
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4" />
     <!-- Microsoft.Extensions.* -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.1.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.1.1-preview.1.25612.2" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.10.2" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.2" />
+    <PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.10.0-preview.1.25513.3" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.2-preview.1.25552.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0" />
-    <!-- Vector Stores -->
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.67.0-preview" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.0-preview" />
     <!-- Semantic Kernel -->
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.67.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.67.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Agents.OpenAI" Version="1.67.0-preview" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Agents.AzureAI" Version="1.67.0-preview" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Plugins.OpenApi" Version="1.67.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.OpenAI" Version="1.66.0-preview" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.AzureAI" Version="1.66.0-preview" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Plugins.OpenApi" Version="1.66.0" />
+    <!-- Vector Stores -->
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.66.0-preview" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.66.0-preview" />
     <!-- Agent SDKs -->
-    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
-    <!-- M365 Agents SDK -->
-    <PackageVersion Include="AdaptiveCards" Version="3.1.0" />
-    <PackageVersion Include="Microsoft.Agents.Authentication.Msal" Version="1.3.171-beta" />
-    <PackageVersion Include="Microsoft.Agents.Hosting.AspNetCore" Version="1.3.171-beta" />
+    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.2.41" />
     <!-- A2A -->
     <PackageVersion Include="A2A" Version="0.3.3-preview" />
     <PackageVersion Include="A2A.AspNetCore" Version="0.3.3-preview" />
     <!-- MCP -->
     <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
     <!-- Inference SDKs -->
-    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.5" />
+    <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
+    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.1" />
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
     <PackageVersion Include="OllamaSharp" Version="5.4.8" />
-    <PackageVersion Include="OpenAI" Version="2.8.0" />
+    <PackageVersion Include="OpenAI" Version="2.6.0" />
     <!-- Identity -->
     <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.78.0" />
     <!-- Workflows -->
-    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.1106.1" />
-    <PackageVersion Include="Microsoft.PowerFx.Interpreter" Version="1.5.0-build.20251008-1002" />
-    <!-- Durable Task -->
-    <PackageVersion Include="Microsoft.DurableTask.Client" Version="1.18.0" />
-    <PackageVersion Include="Microsoft.DurableTask.Client.AzureManaged" Version="1.18.0" />
-    <PackageVersion Include="Microsoft.DurableTask.Worker" Version="1.18.0" />
-    <PackageVersion Include="Microsoft.DurableTask.Worker.AzureManaged" Version="1.18.0" />
-    <!-- Azure Functions -->
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.50.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.50.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.11.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask.AzureManaged" Version="1.0.1" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Mcp" Version="1.0.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
-    <!-- Redis -->
-    <PackageVersion Include="StackExchange.Redis" Version="2.10.1" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.1003.2" />
+    <PackageVersion Include="Microsoft.PowerFx.Interpreter" Version="1.4.0" />
+    <!-- Community -->
+    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
     <!-- Test -->
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.22" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.11" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Moq" Version="[4.18.4]" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Abstractions" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Agents.Yaml" Version="1.66.0-beta" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
     <PackageVersion Include="xretry" Version="1.9.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <!-- Symbols -->
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <!-- Toolset -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -164,17 +135,17 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="[4.14.0]" />
     <PackageReference Include="Roslynator.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="[4.14.0]" />
     <PackageReference Include="Roslynator.CodeAnalysis.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.14.1" />
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="[4.14.0]" />
     <PackageReference Include="Roslynator.Formatting.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

dotnet/agent-framework-dotnet.slnx

@@ -20,40 +20,23 @@
   </Folder>
   <Folder Name="/Samples/AGUIClientServer/">
     <Project Path="samples/AGUIClientServer/AGUIClient/AGUIClient.csproj" />
-    <Project Path="samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj" />
     <Project Path="samples/AGUIClientServer/AGUIServer/AGUIServer.csproj" />
   </Folder>
-  <Folder Name="/Samples/AzureFunctions/">
-    <File Path="samples/AzureFunctions/.editorconfig" />
-    <File Path="samples/AzureFunctions/README.md" />
-    <Project Path="samples/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj" />
-    <Project Path="samples/AzureFunctions/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj" />
-    <Project Path="samples/AzureFunctions/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj" />
-    <Project Path="samples/AzureFunctions/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj" />
-    <Project Path="samples/AzureFunctions/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj" />
-    <Project Path="samples/AzureFunctions/06_LongRunningTools/06_LongRunningTools.csproj" />
-    <Project Path="samples/AzureFunctions/07_AgentAsMcpTool/07_AgentAsMcpTool.csproj" />
-    <Project Path="samples/AzureFunctions/08_ReliableStreaming/08_ReliableStreaming.csproj" />
-  </Folder>
   <Folder Name="/Samples/GettingStarted/">
     <File Path="samples/GettingStarted/README.md" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/A2A/">
     <File Path="samples/GettingStarted/A2A/README.md" />
     <Project Path="samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj" />
-    <Project Path="samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/AgentProviders/">
     <File Path="samples/GettingStarted/AgentProviders/README.md" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj" />
+    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryAgent/Agent_With_AzureFoundryAgent.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj" />
-    <Project Path="samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj" />
     <Project Path="samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj" />
@@ -64,7 +47,8 @@
     <File Path="samples/GettingStarted/Agents/README.md" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj" />
+    <Project Path="samples/GettingStarted/Agents/Agent_Step03.1_UsingFunctionTools/Agent_Step03.1_UsingFunctionTools.csproj" />
+    <Project Path="samples/GettingStarted/Agents/Agent_Step03.2_UsingFunctionTools_FromOpenAPI/Agent_Step03.2_UsingFunctionTools_FromOpenAPI.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
@@ -74,93 +58,28 @@
     <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_BackgroundResponsesWithToolsAndPersistence/Agent_Step13_BackgroundResponsesWithToolsAndPersistence.csproj" />
+    <Project Path="samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.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_DeepResearch/Agent_Step18_DeepResearch.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step19_Declarative/Agent_Step19_Declarative.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/DeclarativeAgents/">
-    <Project Path="samples/GettingStarted/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/">
-    <File Path="samples/GettingStarted/AGUI/README.md" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step01_GettingStarted/">
-    <Project Path="samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step02_BackendTools/">
-    <Project Path="samples/GettingStarted/AGUI/Step02_BackendTools/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step02_BackendTools/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step03_FrontendTools/">
-    <Project Path="samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step04_HumanInLoop/">
-    <Project Path="samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Server.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/AGUI/Step05_StateManagement/">
-    <Project Path="samples/GettingStarted/AGUI/Step05_StateManagement/Client/Client.csproj" />
-    <Project Path="samples/GettingStarted/AGUI/Step05_StateManagement/Server/Server.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" />
   </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/AgentWithAnthropic/">
-    <File Path="samples/GettingStarted/AgentWithAnthropic/README.md" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.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" />
     <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj" />
-  </Folder>
-  <Folder Name="/Samples/Purview/" />
-  <Folder Name="/Samples/Purview/AgentWithPurview/">
-    <Project Path="samples/Purview/AgentWithPurview/AgentWithPurview.csproj" />
   </Folder>
   <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_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj" />
-  </Folder>
-  <Folder Name="/Samples/GettingStarted/FoundryAgents/">
-    <File Path="samples/GettingStarted/FoundryAgents/README.md" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj" />
-    <Project Path="samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj" />
+    <Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_ExternalDataSourceRAG/AgentWithRAG_Step02_ExternalDataSourceRAG.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/ModelContextProtocol/">
     <File Path="samples/GettingStarted/ModelContextProtocol/README.md" />
@@ -186,22 +105,13 @@
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/Declarative/">
     <File Path="samples/GettingStarted/Workflows/Declarative/README.md" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/CustomerSupport/CustomerSupport.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/DeepResearch/DeepResearch.csproj" />
     <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
     <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.csproj" />
     <Project Path="samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/Marketing/Marketing.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/StudentTeacher/StudentTeacher.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/Declarative/Examples/">
-    <File Path="../workflow-samples/CustomerSupport.yaml" />
     <File Path="../workflow-samples/DeepResearch.yaml" />
+    <File Path="../workflow-samples/HumanInLoop.yaml" />
     <File Path="../workflow-samples/Marketing.yaml" />
     <File Path="../workflow-samples/MathChat.yaml" />
     <File Path="../workflow-samples/README.md" />
@@ -232,7 +142,7 @@
     <Project Path="samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/Visualization/">
-    <Project Path="samples/GettingStarted/Workflows/Visualization/Visualization.csproj" />
+    <Project Path="samples/GettingStarted/Workflows/Visualization/Visualization.csproj" Id="99bf0bc6-2440-428e-b3e7-d880e4b7a5fd" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/_Foundational/">
     <Project Path="samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj" />
@@ -244,13 +154,10 @@
     <Project Path="samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/07_MixedWorkflowAgentsAndExecutors.csproj" />
     <Project Path="samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj" />
   </Folder>
-  <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" />
+  <Folder Name="/Samples/Catalog/">
+    <Project Path="samples/Catalog/AgentsInWorkflows/AgentsInWorkflows.csproj" />
+    <Project Path="samples/Catalog/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
+    <Project Path="samples/Catalog/DeepResearchAgent/DeepResearchAgent.csproj" />
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
@@ -351,7 +258,6 @@
     <File Path="src/Shared/Demos/SampleEnvironment.cs" />
   </Folder>
   <Folder Name="/Solution Items/src/Shared/IntegrationTests/">
-    <File Path="src/Shared/IntegrationTests/AnthropicConfiguration.cs" />
     <File Path="src/Shared/IntegrationTests/AzureAIConfiguration.cs" />
     <File Path="src/Shared/IntegrationTests/Mem0Configuration.cs" />
     <File Path="src/Shared/IntegrationTests/OpenAIConfiguration.cs" />
@@ -376,24 +282,16 @@
     <Project Path="src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj" />
     <Project Path="src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Anthropic/Microsoft.Agents.AI.Anthropic.csproj" />
     <Project Path="src/Microsoft.Agents.AI.AzureAI.Persistent/Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.AzureAI/Microsoft.Agents.AI.AzureAI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.CosmosNoSql/Microsoft.Agents.AI.CosmosNoSql.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Declarative/Microsoft.Agents.AI.Declarative.csproj" />
     <Project Path="src/Microsoft.Agents.AI.DevUI/Microsoft.Agents.AI.DevUI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.DurableTask/Microsoft.Agents.AI.DurableTask.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Hosting.AzureFunctions/Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.OpenAI/Microsoft.Agents.AI.Hosting.OpenAI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Mem0/Microsoft.Agents.AI.Mem0.csproj" />
     <Project Path="src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Purview/Microsoft.Agents.AI.Purview.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative.AzureAI/Microsoft.Agents.AI.Workflows.Declarative.AzureAI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative/Microsoft.Agents.AI.Workflows.Declarative.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Workflows/Microsoft.Agents.AI.Workflows.csproj" />
     <Project Path="src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj" />
@@ -401,13 +299,9 @@
   <Folder Name="/Tests/" />
   <Folder Name="/Tests/IntegrationTests/">
     <Project Path="tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj" />
-    <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
-    <Project Path="tests/AzureAI.IntegrationTests/AzureAI.IntegrationTests.csproj" />
     <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
     <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/Microsoft.Agents.AI.DurableTask.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.IntegrationTests/Microsoft.Agents.AI.Mem0.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.csproj" />
     <Project Path="tests/OpenAIAssistant.IntegrationTests/OpenAIAssistant.IntegrationTests.csproj" />
@@ -418,23 +312,15 @@
     <Project Path="tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Anthropic.UnitTests/Microsoft.Agents.AI.Anthropic.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.AzureAI.UnitTests/Microsoft.Agents.AI.AzureAI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.CosmosNoSql.UnitTests/Microsoft.Agents.AI.CosmosNoSql.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Declarative.UnitTests/Microsoft.Agents.AI.Declarative.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DevUI.UnitTests/Microsoft.Agents.AI.DevUI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.DurableTask.UnitTests/Microsoft.Agents.AI.DurableTask.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.UnitTests/Microsoft.Agents.AI.Hosting.A2A.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj" Id="2a1c544d-237d-4436-8732-ba0c447ac06b" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.UnitTests/Microsoft.Agents.AI.Mem0.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.OpenAI.UnitTests/Microsoft.Agents.AI.OpenAI.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Purview.UnitTests/Microsoft.Agents.AI.Purview.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.UnitTests/Microsoft.Agents.AI.Workflows.UnitTests.csproj" />
   </Folder>
-</Solution>
+</Solution>

dotnet/agent-framework-release.slnf

@@ -1,31 +0,0 @@
-{
-  "solution": {
-    "path": "agent-framework-dotnet.slnx",
-    "projects": [
-      "src\\Microsoft.Agents.AI.A2A\\Microsoft.Agents.AI.A2A.csproj",
-      "src\\Microsoft.Agents.AI.Abstractions\\Microsoft.Agents.AI.Abstractions.csproj",
-      "src\\Microsoft.Agents.AI.AGUI\\Microsoft.Agents.AI.AGUI.csproj",
-      "src\\Microsoft.Agents.AI.Anthropic\\Microsoft.Agents.AI.Anthropic.csproj",
-      "src\\Microsoft.Agents.AI.AzureAI.Persistent\\Microsoft.Agents.AI.AzureAI.Persistent.csproj",
-      "src\\Microsoft.Agents.AI.AzureAI\\Microsoft.Agents.AI.AzureAI.csproj",
-      "src\\Microsoft.Agents.AI.CopilotStudio\\Microsoft.Agents.AI.CopilotStudio.csproj",
-      "src\\Microsoft.Agents.AI.CosmosNoSql\\Microsoft.Agents.AI.CosmosNoSql.csproj",
-      "src\\Microsoft.Agents.AI.Declarative\\Microsoft.Agents.AI.Declarative.csproj",
-      "src\\Microsoft.Agents.AI.DevUI\\Microsoft.Agents.AI.DevUI.csproj",
-      "src\\Microsoft.Agents.AI.DurableTask\\Microsoft.Agents.AI.DurableTask.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.A2A\\Microsoft.Agents.AI.Hosting.A2A.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.OpenAI\\Microsoft.Agents.AI.Hosting.OpenAI.csproj",
-      "src\\Microsoft.Agents.AI.Hosting\\Microsoft.Agents.AI.Hosting.csproj",
-      "src\\Microsoft.Agents.AI.Mem0\\Microsoft.Agents.AI.Mem0.csproj",
-      "src\\Microsoft.Agents.AI.OpenAI\\Microsoft.Agents.AI.OpenAI.csproj",
-      "src\\Microsoft.Agents.AI.Purview\\Microsoft.Agents.AI.Purview.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative.AzureAI\\Microsoft.Agents.AI.Workflows.Declarative.AzureAI.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative\\Microsoft.Agents.AI.Workflows.Declarative.csproj",
-      "src\\Microsoft.Agents.AI.Workflows\\Microsoft.Agents.AI.Workflows.csproj",
-      "src\\Microsoft.Agents.AI\\Microsoft.Agents.AI.csproj"
-    ]
-  }
-}

dotnet/eng/MSBuild/Shared.props

@@ -11,13 +11,4 @@
   <ItemGroup Condition="'$(InjectSharedBuildTestCode)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\CodeTests\*.cs" LinkBase="Shared\CodeTests" />
   </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedWorkflowsExecution)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Execution\*.cs" LinkBase="Shared\Workflows" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedWorkflowsSettings)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Settings\*.cs" LinkBase="Shared\Workflows" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(InjectSharedFoundryAgents)' == 'true'">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Foundry\Agents\*.cs" LinkBase="Shared\Foundry" />
-  </ItemGroup>
 </Project>

dotnet/global.json

@@ -1,7 +1,7 @@
 {
     "sdk": {
-        "version": "10.0.100",
-        "rollForward": "minor",
+        "version": "9.0.300",
+        "rollForward": "latestMajor",
         "allowPrerelease": false
     }
 }

dotnet/nuget/nuget-package.props

@@ -2,9 +2,9 @@
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
     <VersionPrefix>1.0.0</VersionPrefix>
-    <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251219.1</PackageVersion>
-    <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251219.1</PackageVersion>
-    <GitTag>1.0.0-preview.251219.1</GitTag>
+    <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251105.1</PackageVersion>
+    <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251105.1</PackageVersion>
+    <GitTag>1.0.0-preview.251105.1</GitTag>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>

dotnet/samples/.editorconfig

@@ -1,7 +1,6 @@
 # Suppressing errors for Sample projects under dotnet/samples folder
 [*.cs]
 dotnet_diagnostic.CA1716.severity = none # Add summary to documentation comment.
-dotnet_diagnostic.CA1873.severity = none # Evaluation of logging arguments may be expensive
 dotnet_diagnostic.CA2000.severity = none # Call System.IDisposable.Dispose on object before all references to it are out of scope
 dotnet_diagnostic.CA2007.severity = none # Do not directly await a Task
 

dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
@@ -12,6 +12,8 @@
     <PackageReference Include="A2A" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs

@@ -4,7 +4,6 @@ using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
 using OpenAI;
-using OpenAI.Chat;
 
 namespace A2A;
 

dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
@@ -11,11 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Azure.AI.Agents.Persistent" />
     <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <PackageReference Include="System.Linq.AsyncEnumerable" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs

@@ -6,7 +6,6 @@ using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using OpenAI;
-using OpenAI.Chat;
 
 namespace A2AServer;
 

dotnet/samples/A2AClientServer/README.md

@@ -103,7 +103,7 @@ dotnet run --urls "http://localhost:5002;https://localhost:5012" --agentId "<Log
 
 ### Testing the Agents using the Rest Client
 
-This sample contains a [.http file](https://learn.microsoft.com/aspnet/core/test/http-files?view=aspnetcore-10.0) which can be used to test the agent.
+This sample contains a [.http file](https://learn.microsoft.com/aspnet/core/test/http-files?view=aspnetcore-9.0) which can be used to test the agent.
 
 1. In Visual Studio open [./A2AServer/A2AServer.http](./A2AServer/A2AServer.http)
 1. There are two sent requests for each agent, e.g., for the invoice agent:

dotnet/samples/AGUIClientServer/AGUIClient/AGUIClient.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10</UserSecretsId>
@@ -11,10 +11,11 @@
   <ItemGroup>
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
   </ItemGroup>
 

dotnet/samples/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use the AG-UI client to connect to a remote AG-UI server
-// and display streaming updates including conversation/response metadata, text content, and errors.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIClient;
-
-[JsonSerializable(typeof(SensorRequest))]
-[JsonSerializable(typeof(SensorResponse))]
-internal sealed partial class AGUIClientSerializerContext : JsonSerializerContext;

dotnet/samples/AGUIClientServer/AGUIClient/Program.cs

@@ -4,9 +4,7 @@
 // and display streaming updates including conversation/response metadata, text content, and errors.
 
 using System.CommandLine;
-using System.ComponentModel;
 using System.Reflection;
-using System.Text;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.AGUI;
 using Microsoft.Extensions.AI;
@@ -53,40 +51,11 @@ public static class Program
             Timeout = TimeSpan.FromSeconds(60)
         };
 
-        var changeBackground = AIFunctionFactory.Create(
-            () =>
-            {
-                Console.ForegroundColor = ConsoleColor.DarkBlue;
-                Console.WriteLine("Changing color to blue");
-            },
-            name: "change_background_color",
-            description: "Change the console background color to dark blue."
-        );
-
-        var readClientClimateSensors = AIFunctionFactory.Create(
-            ([Description("The sensors measurements to include in the response")] SensorRequest request) =>
-            {
-                return new SensorResponse()
-                {
-                    Temperature = 22.5,
-                    Humidity = 45.0,
-                    AirQualityIndex = 75
-                };
-            },
-            name: "read_client_climate_sensors",
-            description: "Reads the climate sensor data from the client device.",
-            serializerOptions: AGUIClientSerializerContext.Default.Options
-        );
-
-        var chatClient = new AGUIChatClient(
-            httpClient,
-            serverUrl,
-            jsonSerializerOptions: AGUIClientSerializerContext.Default.Options);
-
-        AIAgent agent = chatClient.CreateAIAgent(
-            name: "agui-client",
+        AGUIAgent agent = new(
+            id: "agui-client",
             description: "AG-UI Client Agent",
-            tools: [changeBackground, readClientClimateSensors]);
+            httpClient: httpClient,
+            endpoint: serverUrl);
 
         AgentThread thread = agent.GetNewThread();
         List<ChatMessage> messages = [new(ChatRole.System, "You are a helpful assistant.")];
@@ -113,12 +82,10 @@ public static class Program
                 // Call RunStreamingAsync to get streaming updates
                 bool isFirstUpdate = true;
                 string? threadId = null;
-                var updates = new List<ChatResponseUpdate>();
                 await foreach (AgentRunResponseUpdate update in agent.RunStreamingAsync(messages, thread, cancellationToken: cancellationToken))
                 {
                     // Use AsChatResponseUpdate to access ChatResponseUpdate properties
                     ChatResponseUpdate chatUpdate = update.AsChatResponseUpdate();
-                    updates.Add(chatUpdate);
                     if (chatUpdate.ConversationId != null)
                     {
                         threadId = chatUpdate.ConversationId;
@@ -144,25 +111,6 @@ public static class Program
                                 Console.ResetColor();
                                 break;
 
-                            case FunctionCallContent functionCallContent:
-                                Console.ForegroundColor = ConsoleColor.Green;
-                                Console.WriteLine($"\n[Function Call - Name: {functionCallContent.Name}, Arguments: {PrintArguments(functionCallContent.Arguments)}]");
-                                Console.ResetColor();
-                                break;
-
-                            case FunctionResultContent functionResultContent:
-                                Console.ForegroundColor = ConsoleColor.Magenta;
-                                if (functionResultContent.Exception != null)
-                                {
-                                    Console.WriteLine($"\n[Function Result - Exception: {functionResultContent.Exception}]");
-                                }
-                                else
-                                {
-                                    Console.WriteLine($"\n[Function Result - Result: {functionResultContent.Result}]");
-                                }
-                                Console.ResetColor();
-                                break;
-
                             case ErrorContent errorContent:
                                 Console.ForegroundColor = ConsoleColor.Red;
                                 string code = errorContent.AdditionalProperties?["Code"] as string ?? "Unknown";
@@ -172,14 +120,6 @@ public static class Program
                         }
                     }
                 }
-                if (updates.Count > 0 && !updates[^1].Contents.Any(c => c is TextContent))
-                {
-                    var lastUpdate = updates[^1];
-                    Console.ForegroundColor = ConsoleColor.Yellow;
-                    Console.WriteLine();
-                    Console.WriteLine($"[Run Ended - Thread: {threadId}, Run: {lastUpdate.ResponseId}]");
-                    Console.ResetColor();
-                }
                 messages.Clear();
                 Console.WriteLine();
             }
@@ -194,20 +134,4 @@ public static class Program
             return;
         }
     }
-
-    private static string PrintArguments(IDictionary<string, object?>? arguments)
-    {
-        if (arguments == null)
-        {
-            return "";
-        }
-        var builder = new StringBuilder().AppendLine();
-        foreach (var kvp in arguments)
-        {
-            builder
-                .AppendLine($"   Name: {kvp.Key}")
-                .AppendLine($"   Value: {kvp.Value}");
-        }
-        return builder.ToString();
-    }
 }

dotnet/samples/AGUIClientServer/AGUIClient/SensorRequest.cs

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use the AG-UI client to connect to a remote AG-UI server
-// and display streaming updates including conversation/response metadata, text content, and errors.
-
-namespace AGUIClient;
-
-internal sealed class SensorRequest
-{
-    public bool IncludeTemperature { get; set; } = true;
-    public bool IncludeHumidity { get; set; } = true;
-    public bool IncludeAirQualityIndex { get; set; } = true;
-}

dotnet/samples/AGUIClientServer/AGUIClient/SensorResponse.cs

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to use the AG-UI client to connect to a remote AG-UI server
-// and display streaming updates including conversation/response metadata, text content, and errors.
-
-namespace AGUIClient;
-
-internal sealed class SensorResponse
-{
-    public double Temperature { get; set; }
-    public double Humidity { get; set; }
-    public int AirQualityIndex { get; set; }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <UserSecretsId>b9c3f1e1-2fb4-5g29-0e52-53e2b7g9gf21</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-using AGUIDojoServer.AgenticUI;
-using AGUIDojoServer.BackendToolRendering;
-using AGUIDojoServer.PredictiveStateUpdates;
-using AGUIDojoServer.SharedState;
-
-namespace AGUIDojoServer;
-
-[JsonSerializable(typeof(WeatherInfo))]
-[JsonSerializable(typeof(Recipe))]
-[JsonSerializable(typeof(Ingredient))]
-[JsonSerializable(typeof(RecipeResponse))]
-[JsonSerializable(typeof(Plan))]
-[JsonSerializable(typeof(Step))]
-[JsonSerializable(typeof(StepStatus))]
-[JsonSerializable(typeof(StepStatus?))]
-[JsonSerializable(typeof(JsonPatchOperation))]
-[JsonSerializable(typeof(List<JsonPatchOperation>))]
-[JsonSerializable(typeof(List<string>))]
-[JsonSerializable(typeof(DocumentState))]
-internal sealed partial class AGUIDojoServerSerializerContext : JsonSerializerContext;

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs

@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.ComponentModel;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal static class AgenticPlanningTools
-{
-    [Description("Create a plan with multiple steps.")]
-    public static Plan CreatePlan([Description("List of step descriptions to create the plan.")] List<string> steps)
-    {
-        return new Plan
-        {
-            Steps = [.. steps.Select(s => new Step { Description = s, Status = StepStatus.Pending })]
-        };
-    }
-
-    [Description("Update a step in the plan with new description or status.")]
-    public static async Task<List<JsonPatchOperation>> UpdatePlanStepAsync(
-        [Description("The index of the step to update.")] int index,
-        [Description("The new description for the step (optional).")] string? description = null,
-        [Description("The new status for the step (optional).")] StepStatus? status = null)
-    {
-        var changes = new List<JsonPatchOperation>();
-
-        if (description is not null)
-        {
-            changes.Add(new JsonPatchOperation
-            {
-                Op = "replace",
-                Path = $"/steps/{index}/description",
-                Value = description
-            });
-        }
-
-        if (status.HasValue)
-        {
-            // Status must be lowercase to match AG-UI frontend expectations: "pending" or "completed"
-            string statusValue = status.Value == StepStatus.Pending ? "pending" : "completed";
-            changes.Add(new JsonPatchOperation
-            {
-                Op = "replace",
-                Path = $"/steps/{index}/status",
-                Value = statusValue
-            });
-        }
-
-        await Task.Delay(1000);
-
-        return changes;
-    }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticUIAgent.cs

@@ -1,88 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace AGUIDojoServer.AgenticUI;
-
-[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreateAgenticUI")]
-internal sealed class AgenticUIAgent : DelegatingAIAgent
-{
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-    public AgenticUIAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
-        : base(innerAgent)
-    {
-        this._jsonSerializerOptions = jsonSerializerOptions;
-    }
-
-    protected override Task<AgentRunResponse> RunCoreAsync(IEnumerable<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        return this.RunCoreStreamingAsync(messages, thread, options, cancellationToken).ToAgentRunResponseAsync(cancellationToken);
-    }
-
-    protected override async IAsyncEnumerable<AgentRunResponseUpdate> RunCoreStreamingAsync(
-        IEnumerable<ChatMessage> messages,
-        AgentThread? thread = null,
-        AgentRunOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        // Track function calls that should trigger state events
-        var trackedFunctionCalls = new Dictionary<string, FunctionCallContent>();
-
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, thread, options, cancellationToken).ConfigureAwait(false))
-        {
-            // Process contents: track function calls and emit state events for results
-            List<AIContent> stateEventsToEmit = new();
-            foreach (var content in update.Contents)
-            {
-                if (content is FunctionCallContent callContent)
-                {
-                    if (callContent.Name == "create_plan" || callContent.Name == "update_plan_step")
-                    {
-                        trackedFunctionCalls[callContent.CallId] = callContent;
-                        break;
-                    }
-                }
-                else if (content is FunctionResultContent resultContent)
-                {
-                    // Check if this result matches a tracked function call
-                    if (trackedFunctionCalls.TryGetValue(resultContent.CallId, out var matchedCall))
-                    {
-                        var bytes = JsonSerializer.SerializeToUtf8Bytes((JsonElement)resultContent.Result!, this._jsonSerializerOptions);
-
-                        // Determine event type based on the function name
-                        if (matchedCall.Name == "create_plan")
-                        {
-                            stateEventsToEmit.Add(new DataContent(bytes, "application/json"));
-                        }
-                        else if (matchedCall.Name == "update_plan_step")
-                        {
-                            stateEventsToEmit.Add(new DataContent(bytes, "application/json-patch+json"));
-                        }
-                    }
-                }
-            }
-
-            yield return update;
-
-            yield return new AgentRunResponseUpdate(
-                new ChatResponseUpdate(role: ChatRole.System, stateEventsToEmit)
-                {
-                    MessageId = "delta_" + Guid.NewGuid().ToString("N"),
-                    CreatedAt = update.CreatedAt,
-                    ResponseId = update.ResponseId,
-                    AuthorName = update.AuthorName,
-                    Role = update.Role,
-                    ContinuationToken = update.ContinuationToken,
-                    AdditionalProperties = update.AdditionalProperties,
-                })
-            {
-                AgentId = update.AgentId
-            };
-        }
-    }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs

@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class JsonPatchOperation
-{
-    [JsonPropertyName("op")]
-    public required string Op { get; set; }
-
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
-
-    [JsonPropertyName("value")]
-    public object? Value { get; set; }
-
-    [JsonPropertyName("from")]
-    public string? From { get; set; }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Plan.cs

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class Plan
-{
-    [JsonPropertyName("steps")]
-    public List<Step> Steps { get; set; } = [];
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Step.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-internal sealed class Step
-{
-    [JsonPropertyName("description")]
-    public required string Description { get; set; }
-
-    [JsonPropertyName("status")]
-    public StepStatus Status { get; set; } = StepStatus.Pending;
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/StepStatus.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.AgenticUI;
-
-[JsonConverter(typeof(JsonStringEnumConverter<StepStatus>))]
-internal enum StepStatus
-{
-    Pending,
-    Completed
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/BackendToolRendering/WeatherInfo.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.BackendToolRendering;
-
-internal sealed class WeatherInfo
-{
-    [JsonPropertyName("temperature")]
-    public int Temperature { get; init; }
-
-    [JsonPropertyName("conditions")]
-    public string Conditions { get; init; } = string.Empty;
-
-    [JsonPropertyName("humidity")]
-    public int Humidity { get; init; }
-
-    [JsonPropertyName("wind_speed")]
-    public int WindSpeed { get; init; }
-
-    [JsonPropertyName("feelsLike")]
-    public int FeelsLike { get; init; }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs

@@ -1,180 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.ComponentModel;
-using System.Text.Json;
-using AGUIDojoServer.AgenticUI;
-using AGUIDojoServer.BackendToolRendering;
-using AGUIDojoServer.PredictiveStateUpdates;
-using AGUIDojoServer.SharedState;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using ChatClient = OpenAI.Chat.ChatClient;
-
-namespace AGUIDojoServer;
-
-internal static class ChatClientAgentFactory
-{
-    private static AzureOpenAIClient? s_azureOpenAIClient;
-    private static string? s_deploymentName;
-
-    public static void Initialize(IConfiguration configuration)
-    {
-        string endpoint = configuration["AZURE_OPENAI_ENDPOINT"] ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-        s_deploymentName = configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
-
-        s_azureOpenAIClient = new AzureOpenAIClient(
-            new Uri(endpoint),
-            new DefaultAzureCredential());
-    }
-
-    public static ChatClientAgent CreateAgenticChat()
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        return chatClient.AsIChatClient().CreateAIAgent(
-            name: "AgenticChat",
-            description: "A simple chat agent using Azure OpenAI");
-    }
-
-    public static ChatClientAgent CreateBackendToolRendering()
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        return chatClient.AsIChatClient().CreateAIAgent(
-            name: "BackendToolRenderer",
-            description: "An agent that can render backend tools using Azure OpenAI",
-            tools: [AIFunctionFactory.Create(
-                GetWeather,
-                name: "get_weather",
-                description: "Get the weather for a given location.",
-                AGUIDojoServerSerializerContext.Default.Options)]);
-    }
-
-    public static ChatClientAgent CreateHumanInTheLoop()
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        return chatClient.AsIChatClient().CreateAIAgent(
-            name: "HumanInTheLoopAgent",
-            description: "An agent that involves human feedback in its decision-making process using Azure OpenAI");
-    }
-
-    public static ChatClientAgent CreateToolBasedGenerativeUI()
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        return chatClient.AsIChatClient().CreateAIAgent(
-            name: "ToolBasedGenerativeUIAgent",
-            description: "An agent that uses tools to generate user interfaces using Azure OpenAI");
-    }
-
-    public static AIAgent CreateAgenticUI(JsonSerializerOptions options)
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-        var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
-        {
-            Name = "AgenticUIAgent",
-            Description = "An agent that generates agentic user interfaces using Azure OpenAI",
-            ChatOptions = new ChatOptions
-            {
-                Instructions = """
-                    When planning use tools only, without any other messages.
-                    IMPORTANT:
-                    - Use the `create_plan` tool to set the initial state of the steps
-                    - Use the `update_plan_step` tool to update the status of each step
-                    - Do NOT repeat the plan or summarise it in a message
-                    - Do NOT confirm the creation or updates in a message
-                    - Do NOT ask the user for additional information or next steps
-                    - Do NOT leave a plan hanging, always complete the plan via `update_plan_step` if one is ongoing.
-                    - Continue calling update_plan_step until all steps are marked as completed.
-
-                    Only one plan can be active at a time, so do not call the `create_plan` tool
-                    again until all the steps in current plan are completed.
-                    """,
-                Tools = [
-                    AIFunctionFactory.Create(
-                        AgenticPlanningTools.CreatePlan,
-                        name: "create_plan",
-                        description: "Create a plan with multiple steps.",
-                        AGUIDojoServerSerializerContext.Default.Options),
-                    AIFunctionFactory.Create(
-                        AgenticPlanningTools.UpdatePlanStepAsync,
-                        name: "update_plan_step",
-                        description: "Update a step in the plan with new description or status.",
-                        AGUIDojoServerSerializerContext.Default.Options)
-                ],
-                AllowMultipleToolCalls = false
-            }
-        });
-
-        return new AgenticUIAgent(baseAgent, options);
-    }
-
-    public static AIAgent CreateSharedState(JsonSerializerOptions options)
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        var baseAgent = chatClient.AsIChatClient().CreateAIAgent(
-            name: "SharedStateAgent",
-            description: "An agent that demonstrates shared state patterns using Azure OpenAI");
-
-        return new SharedStateAgent(baseAgent, options);
-    }
-
-    public static AIAgent CreatePredictiveStateUpdates(JsonSerializerOptions options)
-    {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
-
-        var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
-        {
-            Name = "PredictiveStateUpdatesAgent",
-            Description = "An agent that demonstrates predictive state updates using Azure OpenAI",
-            ChatOptions = new ChatOptions
-            {
-                Instructions = """
-                    You are a document editor assistant. When asked to write or edit content:
-                    
-                    IMPORTANT:
-                    - Use the `write_document` tool with the full document text in Markdown format
-                    - Format the document extensively so it's easy to read
-                    - You can use all kinds of markdown (headings, lists, bold, etc.)
-                    - However, do NOT use italic or strike-through formatting
-                    - You MUST write the full document, even when changing only a few words
-                    - When making edits to the document, try to make them minimal - do not change every word
-                    - Keep stories SHORT!
-                    - After you are done writing the document you MUST call a confirm_changes tool after you call write_document
-                    
-                    After the user confirms the changes, provide a brief summary of what you wrote.
-                    """,
-                Tools = [
-                    AIFunctionFactory.Create(
-                        WriteDocument,
-                        name: "write_document",
-                        description: "Write a document. Use markdown formatting to format the document.",
-                        AGUIDojoServerSerializerContext.Default.Options)
-                ]
-            }
-        });
-
-        return new PredictiveStateUpdatesAgent(baseAgent, options);
-    }
-
-    [Description("Get the weather for a given location.")]
-    private static WeatherInfo GetWeather([Description("The location to get the weather for.")] string location) => new()
-    {
-        Temperature = 20,
-        Conditions = "sunny",
-        Humidity = 50,
-        WindSpeed = 10,
-        FeelsLike = 25
-    };
-
-    [Description("Write a document in markdown format.")]
-    private static string WriteDocument([Description("The document content to write.")] string document)
-    {
-        // Simply return success - the document is tracked via state updates
-        return "Document written successfully";
-    }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.PredictiveStateUpdates;
-
-internal sealed class DocumentState
-{
-    [JsonPropertyName("document")]
-    public string Document { get; set; } = string.Empty;
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/PredictiveStateUpdatesAgent.cs

@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace AGUIDojoServer.PredictiveStateUpdates;
-
-[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreatePredictiveStateUpdates")]
-internal sealed class PredictiveStateUpdatesAgent : DelegatingAIAgent
-{
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
-    private const int ChunkSize = 10; // Characters per chunk for streaming effect
-
-    public PredictiveStateUpdatesAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
-        : base(innerAgent)
-    {
-        this._jsonSerializerOptions = jsonSerializerOptions;
-    }
-
-    protected override Task<AgentRunResponse> RunCoreAsync(IEnumerable<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        return this.RunCoreStreamingAsync(messages, thread, options, cancellationToken).ToAgentRunResponseAsync(cancellationToken);
-    }
-
-    protected override async IAsyncEnumerable<AgentRunResponseUpdate> RunCoreStreamingAsync(
-        IEnumerable<ChatMessage> messages,
-        AgentThread? thread = null,
-        AgentRunOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        // Track the last emitted document state to avoid duplicates
-        string? lastEmittedDocument = null;
-
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, thread, options, cancellationToken).ConfigureAwait(false))
-        {
-            // Check if we're seeing a write_document tool call and emit predictive state
-            bool hasToolCall = false;
-            string? documentContent = null;
-
-            foreach (var content in update.Contents)
-            {
-                if (content is FunctionCallContent callContent && callContent.Name == "write_document")
-                {
-                    hasToolCall = true;
-                    // Try to extract the document argument directly from the dictionary
-                    if (callContent.Arguments?.TryGetValue("document", out var documentValue) == true)
-                    {
-                        documentContent = documentValue?.ToString();
-                    }
-                }
-            }
-
-            // Always yield the original update first
-            yield return update;
-
-            // If we got a complete tool call with document content, "fake" stream it in chunks
-            if (hasToolCall && documentContent != null && documentContent != lastEmittedDocument)
-            {
-                // Chunk the document content and emit progressive state updates
-                int startIndex = 0;
-                if (lastEmittedDocument != null && documentContent.StartsWith(lastEmittedDocument, StringComparison.Ordinal))
-                {
-                    // Only stream the new portion that was added
-                    startIndex = lastEmittedDocument.Length;
-                }
-
-                // Stream the document in chunks
-                for (int i = startIndex; i < documentContent.Length; i += ChunkSize)
-                {
-                    int length = Math.Min(ChunkSize, documentContent.Length - i);
-                    string chunk = documentContent.Substring(0, i + length);
-
-                    // Prepare predictive state update as DataContent
-                    var stateUpdate = new DocumentState { Document = chunk };
-                    byte[] stateBytes = JsonSerializer.SerializeToUtf8Bytes(
-                        stateUpdate,
-                        this._jsonSerializerOptions.GetTypeInfo(typeof(DocumentState)));
-
-                    yield return new AgentRunResponseUpdate(
-                        new ChatResponseUpdate(role: ChatRole.Assistant, [new DataContent(stateBytes, "application/json")])
-                        {
-                            MessageId = "snapshot" + Guid.NewGuid().ToString("N"),
-                            CreatedAt = update.CreatedAt,
-                            ResponseId = update.ResponseId,
-                            AdditionalProperties = update.AdditionalProperties,
-                            AuthorName = update.AuthorName,
-                            ContinuationToken = update.ContinuationToken,
-                        })
-                    {
-                        AgentId = update.AgentId
-                    };
-
-                    // Small delay to simulate streaming
-                    await Task.Delay(50, cancellationToken).ConfigureAwait(false);
-                }
-
-                lastEmittedDocument = documentContent;
-            }
-        }
-    }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/Program.cs

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using AGUIDojoServer;
-using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
-using Microsoft.AspNetCore.HttpLogging;
-using Microsoft.Extensions.Options;
-
-WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-
-builder.Services.AddHttpLogging(logging =>
-{
-    logging.LoggingFields = HttpLoggingFields.RequestPropertiesAndHeaders | HttpLoggingFields.RequestBody
-        | HttpLoggingFields.ResponsePropertiesAndHeaders | HttpLoggingFields.ResponseBody;
-    logging.RequestBodyLogLimit = int.MaxValue;
-    logging.ResponseBodyLogLimit = int.MaxValue;
-});
-
-builder.Services.AddHttpClient().AddLogging();
-builder.Services.ConfigureHttpJsonOptions(options => options.SerializerOptions.TypeInfoResolverChain.Add(AGUIDojoServerSerializerContext.Default));
-builder.Services.AddAGUI();
-
-WebApplication app = builder.Build();
-
-app.UseHttpLogging();
-
-// Initialize the factory
-ChatClientAgentFactory.Initialize(app.Configuration);
-
-// Map the AG-UI agent endpoints for different scenarios
-app.MapAGUI("/agentic_chat", ChatClientAgentFactory.CreateAgenticChat());
-
-app.MapAGUI("/backend_tool_rendering", ChatClientAgentFactory.CreateBackendToolRendering());
-
-app.MapAGUI("/human_in_the_loop", ChatClientAgentFactory.CreateHumanInTheLoop());
-
-app.MapAGUI("/tool_based_generative_ui", ChatClientAgentFactory.CreateToolBasedGenerativeUI());
-
-var jsonOptions = app.Services.GetRequiredService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>();
-app.MapAGUI("/agentic_generative_ui", ChatClientAgentFactory.CreateAgenticUI(jsonOptions.Value.SerializerOptions));
-
-app.MapAGUI("/shared_state", ChatClientAgentFactory.CreateSharedState(jsonOptions.Value.SerializerOptions));
-
-app.MapAGUI("/predictive_state_updates", ChatClientAgentFactory.CreatePredictiveStateUpdates(jsonOptions.Value.SerializerOptions));
-
-await app.RunAsync();
-
-public partial class Program;

dotnet/samples/AGUIClientServer/AGUIDojoServer/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "AGUIDojoServer": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:5018"
-    }
-  }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Ingredient.cs

@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.SharedState;
-
-internal sealed class Ingredient
-{
-    [JsonPropertyName("icon")]
-    public string Icon { get; set; } = string.Empty;
-
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    [JsonPropertyName("amount")]
-    public string Amount { get; set; } = string.Empty;
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Recipe.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.SharedState;
-
-internal sealed class Recipe
-{
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
-
-    [JsonPropertyName("skill_level")]
-    public string SkillLevel { get; set; } = string.Empty;
-
-    [JsonPropertyName("cooking_time")]
-    public string CookingTime { get; set; } = string.Empty;
-
-    [JsonPropertyName("special_preferences")]
-    public List<string> SpecialPreferences { get; set; } = [];
-
-    [JsonPropertyName("ingredients")]
-    public List<Ingredient> Ingredients { get; set; } = [];
-
-    [JsonPropertyName("instructions")]
-    public List<string> Instructions { get; set; } = [];
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/RecipeResponse.cs

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIDojoServer.SharedState;
-
-#pragma warning disable CA1812 // Used for the JsonSchema response format
-internal sealed class RecipeResponse
-#pragma warning restore CA1812
-{
-    [JsonPropertyName("recipe")]
-    public Recipe Recipe { get; set; } = new();
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs

@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace AGUIDojoServer.SharedState;
-
-[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by ChatClientAgentFactory.CreateSharedState")]
-internal sealed class SharedStateAgent : DelegatingAIAgent
-{
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-    public SharedStateAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
-        : base(innerAgent)
-    {
-        this._jsonSerializerOptions = jsonSerializerOptions;
-    }
-
-    protected override Task<AgentRunResponse> RunCoreAsync(IEnumerable<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        return this.RunCoreStreamingAsync(messages, thread, options, cancellationToken).ToAgentRunResponseAsync(cancellationToken);
-    }
-
-    protected override async IAsyncEnumerable<AgentRunResponseUpdate> RunCoreStreamingAsync(
-        IEnumerable<ChatMessage> messages,
-        AgentThread? thread = null,
-        AgentRunOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        if (options is not ChatClientAgentRunOptions { ChatOptions.AdditionalProperties: { } properties } chatRunOptions ||
-            !properties.TryGetValue("ag_ui_state", out JsonElement state))
-        {
-            await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, thread, options, cancellationToken).ConfigureAwait(false))
-            {
-                yield return update;
-            }
-            yield break;
-        }
-
-        var firstRunOptions = new ChatClientAgentRunOptions
-        {
-            ChatOptions = chatRunOptions.ChatOptions.Clone(),
-            AllowBackgroundResponses = chatRunOptions.AllowBackgroundResponses,
-            ContinuationToken = chatRunOptions.ContinuationToken,
-            ChatClientFactory = chatRunOptions.ChatClientFactory,
-        };
-
-        // Configure JSON schema response format for structured state output
-        firstRunOptions.ChatOptions.ResponseFormat = ChatResponseFormat.ForJsonSchema<RecipeResponse>(
-            schemaName: "RecipeResponse",
-            schemaDescription: "A response containing a recipe with title, skill level, cooking time, preferences, ingredients, and instructions");
-
-        ChatMessage stateUpdateMessage = new(
-            ChatRole.System,
-            [
-                new TextContent("Here is the current state in JSON format:"),
-                    new TextContent(state.GetRawText()),
-                    new TextContent("The new state is:")
-            ]);
-
-        var firstRunMessages = messages.Append(stateUpdateMessage);
-
-        var allUpdates = new List<AgentRunResponseUpdate>();
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(firstRunMessages, thread, firstRunOptions, cancellationToken).ConfigureAwait(false))
-        {
-            allUpdates.Add(update);
-
-            // Yield all non-text updates (tool calls, etc.)
-            bool hasNonTextContent = update.Contents.Any(c => c is not TextContent);
-            if (hasNonTextContent)
-            {
-                yield return update;
-            }
-        }
-
-        var response = allUpdates.ToAgentRunResponse();
-
-        if (response.TryDeserialize(this._jsonSerializerOptions, out JsonElement stateSnapshot))
-        {
-            byte[] stateBytes = JsonSerializer.SerializeToUtf8Bytes(
-                stateSnapshot,
-                this._jsonSerializerOptions.GetTypeInfo(typeof(JsonElement)));
-            yield return new AgentRunResponseUpdate
-            {
-                Contents = [new DataContent(stateBytes, "application/json")]
-            };
-        }
-        else
-        {
-            yield break;
-        }
-
-        var secondRunMessages = messages.Concat(response.Messages).Append(
-            new ChatMessage(
-                ChatRole.System,
-                [new TextContent("Please provide a concise summary of the state changes in at most two sentences.")]));
-
-        await foreach (var update in this.InnerAgent.RunStreamingAsync(secondRunMessages, thread, options, cancellationToken).ConfigureAwait(false))
-        {
-            yield return update;
-        }
-    }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.Development.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Microsoft.AspNetCore.HttpLogging.HttpLoggingMiddleware": "Information"
-    }
-  }
-}

dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.json

@@ -1,10 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Microsoft.AspNetCore.HttpLogging.HttpLoggingMiddleware": "Information"
-    }
-  },
-  "AllowedHosts": "*"
-}

dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10</UserSecretsId>
@@ -11,6 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="10.0.0-rc.2.25502.107" />
+    <PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-rc.2.25502.107" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs

@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json.Serialization;
-
-namespace AGUIServer;
-
-[JsonSerializable(typeof(ServerWeatherForecastRequest))]
-[JsonSerializable(typeof(ServerWeatherForecastResponse))]
-internal sealed partial class AGUIServerSerializerContext : JsonSerializerContext;

dotnet/samples/AGUIClientServer/AGUIServer/Program.cs

@@ -1,49 +1,24 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using System.ComponentModel;
-using AGUIServer;
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
 using Microsoft.Extensions.AI;
-using OpenAI.Chat;
+using OpenAI;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 builder.Services.AddHttpClient().AddLogging();
-builder.Services.ConfigureHttpJsonOptions(options => options.SerializerOptions.TypeInfoResolverChain.Add(AGUIServerSerializerContext.Default));
-builder.Services.AddAGUI();
-
 WebApplication app = builder.Build();
 
 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"] ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
 string deploymentName = builder.Configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
 
-// Create the AI agent with tools
+// Create the AI agent
 var agent = new AzureOpenAIClient(
         new Uri(endpoint),
         new DefaultAzureCredential())
     .GetChatClient(deploymentName)
-    .CreateAIAgent(
-        name: "AGUIAssistant",
-        tools: [
-            AIFunctionFactory.Create(
-                () => DateTimeOffset.UtcNow,
-                name: "get_current_time",
-                description: "Get the current UTC time."
-            ),
-            AIFunctionFactory.Create(
-                ([Description("The weather forecast request")]ServerWeatherForecastRequest request) => {
-                    return new ServerWeatherForecastResponse()
-                    {
-                        Summary = "Sunny",
-                        TemperatureC = 25,
-                        Date = request.Date
-                    };
-                },
-                name: "get_server_weather_forecast",
-                description: "Gets the forecast for a specific location and date",
-                AGUIServerSerializerContext.Default.Options)
-        ]);
+    .CreateAIAgent(name: "AGUIAssistant");
 
 // Map the AG-UI agent endpoint
 app.MapAGUI("/", agent);

dotnet/samples/AGUIClientServer/AGUIServer/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "AGUIServer": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:5100;https://localhost:5101"
-    }
-  }
-}

dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs

@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace AGUIServer;
-
-internal sealed class ServerWeatherForecastRequest
-{
-    public DateTime Date { get; set; }
-    public string Location { get; set; } = "Seattle";
-}

dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastResponse.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace AGUIServer;
-
-internal sealed class ServerWeatherForecastResponse
-{
-    public string Summary { get; set; } = "";
-
-    public int TemperatureC { get; set; }
-
-    public DateTime Date { get; set; }
-}

dotnet/samples/AGUIClientServer/README.md

@@ -134,21 +134,15 @@ This automatically handles:
 
 ### Client Side
 
-The `AGUIClient` uses the `AGUIChatClient` to connect to the remote server:
+The `AGUIClient` uses the `AGUIAgent` class to connect to the remote server:
 
 ```csharp
-using HttpClient httpClient = new();
-var chatClient = new AGUIChatClient(
-    httpClient,
-    endpoint: serverUrl,
-    modelId: "agui-client",
-    jsonSerializerOptions: null);
-
-AIAgent agent = chatClient.CreateAIAgent(
-    instructions: null,
-    name: "agui-client",
+AGUIAgent agent = new(
+    id: "agui-client",
     description: "AG-UI Client Agent",
-    tools: []);
+    messages: [],
+    httpClient: httpClient,
+    endpoint: serverUrl);
 
 bool isFirstUpdate = true;
 AgentRunResponseUpdate? currentUpdate = null;

dotnet/samples/AGUIWebChat/Client/AGUIWebChatClient.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/AGUIWebChat/Client/Components/App.razor

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="/" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="AGUIWebChatClient.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <HeadOutlet @rendermode="@renderMode" />
-</head>
-
-<body>
-    <Routes @rendermode="@renderMode" />
-    <script src="_framework/blazor.web.js"></script>
-</body>
-
-</html>
-
-@code {
-    private readonly IComponentRenderMode renderMode = new InteractiveServerRenderMode(prerender: false);
-}

dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor

@@ -1 +0,0 @@
-<div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div>

dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor.css

@@ -1,89 +0,0 @@
-/* Used under CC0 license */
-
-.lds-ellipsis {
-    color: #666;
-    animation: fade-in 1s;
-}
-
-@keyframes fade-in {
-    0% {
-        opacity: 0;
-    }
-
-    100% {
-        opacity: 1;
-    }
-}
-
-    .lds-ellipsis,
-    .lds-ellipsis div {
-        box-sizing: border-box;
-    }
-
-.lds-ellipsis {
-    margin: auto;
-    display: block;
-    position: relative;
-    width: 80px;
-    height: 80px;
-}
-
-    .lds-ellipsis div {
-        position: absolute;
-        top: 33.33333px;
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        background: currentColor;
-        animation-timing-function: cubic-bezier(0, 1, 1, 0);
-    }
-
-        .lds-ellipsis div:nth-child(1) {
-            left: 8px;
-            animation: lds-ellipsis1 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(2) {
-            left: 8px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(3) {
-            left: 32px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-
-        .lds-ellipsis div:nth-child(4) {
-            left: 56px;
-            animation: lds-ellipsis3 0.6s infinite;
-        }
-
-@keyframes lds-ellipsis1 {
-    0% {
-        transform: scale(0);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@keyframes lds-ellipsis3 {
-    0% {
-        transform: scale(1);
-    }
-
-    100% {
-        transform: scale(0);
-    }
-}
-
-@keyframes lds-ellipsis2 {
-    0% {
-        transform: translate(0, 0);
-    }
-
-    100% {
-        transform: translate(24px, 0);
-    }
-}

dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor

@@ -1,9 +0,0 @@
-@inherits LayoutComponentBase
-
-@Body
-
-<div id="blazor-error-ui" data-nosnippet>
-    An unhandled error has occurred.
-    <a href="." class="reload">Reload</a>
-    <span class="dismiss">🗙</span>
-</div>

dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor.css

@@ -1,20 +0,0 @@
-#blazor-error-ui {
-    color-scheme: light only;
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    box-sizing: border-box;
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }

dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor

@@ -1,94 +0,0 @@
-@page "/"
-@using System.ComponentModel
-@inject IChatClient ChatClient
-@inject NavigationManager Nav
-@implements IDisposable
-
-<PageTitle>Chat</PageTitle>
-
-<ChatHeader OnNewChat="@ResetConversationAsync" />
-
-<ChatMessageList Messages="@messages" InProgressMessage="@currentResponseMessage">
-    <NoMessagesContent>
-        <div>Ask the assistant a question to start a conversation.</div>
-    </NoMessagesContent>
-</ChatMessageList>
-<div class="chat-container">
-    <ChatSuggestions OnSelected="@AddUserMessageAsync" @ref="@chatSuggestions" />
-    <ChatInput OnSend="@AddUserMessageAsync" @ref="@chatInput" />
-</div>
-
-@code {
-    private const string SystemPrompt = @"
-        You are a helpful assistant.
-        ";
-
-    private int statefulMessageCount;
-    private readonly ChatOptions chatOptions = new();
-    private readonly List<ChatMessage> messages = new();
-    private CancellationTokenSource? currentResponseCancellation;
-    private ChatMessage? currentResponseMessage;
-    private ChatInput? chatInput;
-    private ChatSuggestions? chatSuggestions;
-
-    protected override void OnInitialized()
-    {
-        statefulMessageCount = 0;
-        messages.Add(new(ChatRole.System, SystemPrompt));
-    }
-
-    private async Task AddUserMessageAsync(ChatMessage userMessage)
-    {
-        CancelAnyCurrentResponse();
-
-        // Add the user message to the conversation
-        messages.Add(userMessage);
-        chatSuggestions?.Clear();
-        await chatInput!.FocusAsync();
-
-        // Stream and display a new response from the IChatClient
-        var responseText = new TextContent("");
-        currentResponseMessage = new ChatMessage(ChatRole.Assistant, [responseText]);
-        StateHasChanged();
-        currentResponseCancellation = new();
-        await foreach (var update in ChatClient.GetStreamingResponseAsync(messages.Skip(statefulMessageCount), chatOptions, currentResponseCancellation.Token))
-        {
-            messages.AddMessages(update, filter: c => c is not TextContent);
-            responseText.Text += update.Text;
-            chatOptions.ConversationId = update.ConversationId;
-            ChatMessageItem.NotifyChanged(currentResponseMessage);
-        }
-
-        // Store the final response in the conversation, and begin getting suggestions
-        messages.Add(currentResponseMessage!);
-        statefulMessageCount = chatOptions.ConversationId is not null ? messages.Count : 0;
-        currentResponseMessage = null;
-        chatSuggestions?.Update(messages);
-    }
-
-    private void CancelAnyCurrentResponse()
-    {
-        // If a response was cancelled while streaming, include it in the conversation so it's not lost
-        if (currentResponseMessage is not null)
-        {
-            messages.Add(currentResponseMessage);
-        }
-
-        currentResponseCancellation?.Cancel();
-        currentResponseMessage = null;
-    }
-
-    private async Task ResetConversationAsync()
-    {
-        CancelAnyCurrentResponse();
-        messages.Clear();
-        messages.Add(new(ChatRole.System, SystemPrompt));
-        chatOptions.ConversationId = null;
-        statefulMessageCount = 0;
-        chatSuggestions?.Clear();
-        await chatInput!.FocusAsync();
-    }
-
-    public void Dispose()
-        => currentResponseCancellation?.Cancel();
-}

dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor.css

@@ -1,11 +0,0 @@
-.chat-container {
-    position: sticky;
-    bottom: 0;
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;
-    padding-top: 0.75rem;
-    padding-bottom: 1.5rem;
-    border-top-width: 1px;
-    background-color: #F3F4F6;
-    border-color: #E5E7EB;
-}

dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor

@@ -1,38 +0,0 @@
-@using System.Web
-@if (!string.IsNullOrWhiteSpace(viewerUrl))
-{
-    <a href="@viewerUrl" target="_blank" class="citation">
-        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />
-        </svg>
-        <div class="citation-content">
-            <div class="citation-file">@File</div>
-            <div>@Quote</div>
-        </div>
-    </a>
-}
-
-@code {
-    [Parameter]
-    public required string File { get; set; }
-
-    [Parameter]
-    public int? PageNumber { get; set; }
-
-    [Parameter]
-    public required string Quote { get; set; }
-
-    private string? viewerUrl;
-
-    protected override void OnParametersSet()
-    {
-        viewerUrl = null;
-
-        // If you ingest other types of content besides PDF files, construct a URL to an appropriate viewer here
-        if (File.EndsWith(".pdf"))
-        {
-            var search = Quote?.Trim('.', ',', ' ', '\n', '\r', '\t', '"', '\'');
-            viewerUrl = $"lib/pdf_viewer/viewer.html?file=/Data/{HttpUtility.UrlEncode(File)}#page={PageNumber}&search={HttpUtility.UrlEncode(search)}&phrase=true";
-        }
-    }
-}

dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor.css

@@ -1,37 +0,0 @@
-.citation {
-    display: inline-flex;
-    padding-top: 0.5rem;
-    padding-bottom: 0.5rem;
-    padding-left: 0.75rem;
-    padding-right: 0.75rem;
-    margin-top: 1rem;
-    margin-right: 1rem;
-    border-bottom: 2px solid #a770de;
-    gap: 0.5rem;
-    border-radius: 0.25rem;
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-    background-color: #ffffff;
-}
-
-    .citation[href]:hover {
-        outline: 1px solid #865cb1;
-    }
-
-    .citation svg {
-        width: 1.5rem;
-        height: 1.5rem;
-    }
-
-    .citation:active {
-        background-color: rgba(0,0,0,0.05);
-    }
-
-.citation-content {
-    display: flex;
-    flex-direction: column;
-}
-
-.citation-file {
-    font-weight: 600;
-}