Merge branch 'main' into dev/dotnet_workflow/fix_concurrent_sample

refactor: Update Concurrent sample to use message delivery event callback
2026-06-16 21:04:09 +08:00 · 2026-04-07 07:51:58 -04:00 · 2026-04-03 20:01:20 -04:00 · 2026-04-03 17:52:43 -04:00 · 2026-04-03 17:51:57 -04:00
572 changed files with 3747 additions and 26487 deletions
@@ -21,7 +21,6 @@ ignorePatterns:
  - pattern: "http://host.docker.internal"
  - pattern: "https://openai.github.io/openai-agents-js/openai/agents/classes/"
  - pattern: "https:\/\/dotnet.microsoft.com\/download"
-  - pattern: "https://github.com/Rel1cx/eslint-react"
 # excludedDirs:
  # Folders which include links to localhost, since it's not ignored with regular expressions
 baseUrl: https://github.com/microsoft/agent-framework/
@@ -48,8 +48,7 @@ jobs:
            .
            .github
            dotnet
-            python
-            declarative-agents
+            workflow-samples

      - name: Setup dotnet
        uses: actions/setup-dotnet@v5.2.0
@@ -64,20 +63,6 @@ jobs:
          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

-      - name: Generate filtered solution
-        shell: pwsh
-        run: |
-          ./dotnet/eng/scripts/New-FilteredSolution.ps1 `
-            -Solution dotnet/agent-framework-dotnet.slnx `
-            -TargetFramework net10.0 `
-            -Configuration Debug `
-            -OutputPath dotnet/filtered.slnx `
-            -Verbose
-
-      - name: Build solution
-        shell: bash
-        run: dotnet build dotnet/filtered.slnx -f net10.0 --warnaserror
-
      - name: Run verify-samples
        id: verify
        working-directory: dotnet
@@ -171,7 +171,7 @@ jobs:
          -m integration
          -n logical --dist worksteal
          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 30
+          --retries 2 --retry-delay 5
      - name: Stop local MCP server
        if: always()
        shell: bash
@@ -115,13 +115,12 @@ jobs:
          -m "not integration"
          --timeout=120 --session-timeout=900 --timeout_method thread
          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
        working-directory: ./python
      - name: Surface failing tests
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -164,7 +163,6 @@ jobs:
          -n logical --dist worksteal
          --timeout=120 --session-timeout=900 --timeout_method thread
          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
        working-directory: ./python
      - name: Test OpenAI samples
        timeout-minutes: 10
@@ -175,7 +173,7 @@ jobs:
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -227,7 +225,6 @@ jobs:
          -n logical --dist worksteal
          --timeout=120 --session-timeout=900 --timeout_method thread
          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
        working-directory: ./python
      - name: Test Azure samples
        timeout-minutes: 10
@@ -238,7 +235,7 @@ jobs:
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -287,8 +284,7 @@ jobs:
          -m integration
          -n logical --dist worksteal
          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 30
-          --junitxml=pytest.xml
+          --retries 2 --retry-delay 5
        working-directory: ./python
      - name: Stop local MCP server
        if: always()
@@ -314,7 +310,7 @@ jobs:
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -379,13 +375,12 @@ jobs:
          -x
          --timeout=360 --session-timeout=900 --timeout_method thread
          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
        working-directory: ./python
      - name: Surface failing tests
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -435,13 +430,12 @@ jobs:
          -n logical --dist worksteal
          --timeout=120 --session-timeout=900 --timeout_method thread
          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
        working-directory: ./python
      - name: Surface failing tests
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -495,13 +489,13 @@ jobs:
          echo "Cosmos DB emulator did not become ready in time." >&2
          exit 1
      - name: Test with pytest (Cosmos integration)
-        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5 --junitxml=pytest.xml
+        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5
        working-directory: ./python
      - name: Surface failing tests
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -40,7 +40,7 @@ jobs:
          UV_CACHE_DIR: /tmp/.uv-cache
      # Unit tests
      - name: Run all tests
-        run: uv run poe test -A --junitxml=pytest.xml
+        run: uv run poe test -A
        working-directory: ./python

      # Surface failing tests
@@ -48,7 +48,7 @@ jobs:
        if: always()
        uses: pmeier/pytest-results-action@v0.7.2
        with:
-          path: ./python/pytest.xml
+          path: ./python/**.xml
          summary: true
          display-options: fEX
          fail-on-empty: false
@@ -47,8 +47,6 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-pytest.xml
-python-coverage.xml
 *.cover
 *.py,cover
 .hypothesis/
@@ -9,16 +9,9 @@ The `verify-samples` project (`dotnet/eng/verify-samples/`) is an automated tool

 ## Running verify-samples

-**Important:** By default, samples must be pre-built before running verify-samples. Build the solution first, or pass `--build` to build samples during the run:
-
 ```bash
 cd dotnet
-dotnet build agent-framework-dotnet.slnx -f net10.0
-```

-Then run verify-samples:
-
-```bash
 # Run all samples across all categories
 dotnet run --project eng/verify-samples -- --log results.log --csv results.csv

@@ -31,10 +24,6 @@ dotnet run --project eng/verify-samples -- Agent_Step02_StructuredOutput Agent_S
 # Control parallelism (default 8)
 dotnet run --project eng/verify-samples -- --parallel 8 --log results.log

-# Build samples during run (skips the need for a prior build step)
-# This may cause build conflicts as multiple samples are built in parallel, so use with caution
-dotnet run --project eng/verify-samples -- --build --log results.log
-
 # Combine options
 dotnet run --project eng/verify-samples -- --category 03-workflows --parallel 4 --log results.log --csv results.csv --md results.md
 ```
@@ -4,9 +4,8 @@
  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
  <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. Only run for net10.0 target frameworks since the dotnet format command -->
-  <!-- already formats all target frameworks in project. Otherwise it will run format x times x where x is the number of target frameworks -->
-  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' AND '$(TargetFramework)' == 'net10.0' ">
+  <!-- as this runs in its own Actions job. -->
+  <Target Name="DotnetFormatOnBuild" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' ">
    <Message Text="Running dotnet format" Importance="high" />
    <Exec Command="dotnet format --no-restore -v diag $(ProjectFileName)" />
  </Target>
@@ -11,8 +11,8 @@
  </PropertyGroup>
  <ItemGroup>
    <!-- Aspire.* -->
-    <PackageVersion Include="Anthropic" Version="12.13.0" />
-    <PackageVersion Include="Anthropic.Foundry" Version="0.5.0" />
+    <PackageVersion Include="Anthropic" Version="12.11.0" />
+    <PackageVersion Include="Anthropic.Foundry" Version="0.4.2" />
    <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
    <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
@@ -32,19 +32,19 @@
    <!-- Newtonsoft.Json -->
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
    <!-- System.* -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.4" />
    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
    <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.4" />
    <PackageVersion Include="System.ClientModel" Version="1.10.0" />
    <PackageVersion Include="System.CodeDom" Version="10.0.0" />
    <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.6" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.4" />
    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.4" />
    <PackageVersion Include="System.Net.Http.Json" Version="10.0.0" />
    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.6" />
-    <PackageVersion Include="System.Threading.Channels" Version="10.0.6" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.4" />
+    <PackageVersion Include="System.Threading.Channels" Version="10.0.4" />
    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
    <PackageVersion Include="System.Net.Security" Version="4.3.2" />
    <!-- OpenTelemetry -->
@@ -63,31 +63,37 @@
    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.0" />
    <!-- Microsoft.Extensions.* -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.4.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.4.0" />
    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation" Version="10.4.0" />
    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.4.0" />
    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="10.3.0-preview.1.26109.11" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.4.0" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.4.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.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
    <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.6" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.4" />
    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
    <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" />
    <!-- Agent SDKs -->
    <PackageVersion Include="GitHub.Copilot.SDK" Version="0.1.29" />
    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
@@ -101,10 +107,11 @@
    <!-- MCP -->
    <PackageVersion Include="ModelContextProtocol" Version="1.1.0" />
    <!-- Inference SDKs -->
+    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.5.1" />
    <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
    <PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
    <PackageVersion Include="OllamaSharp" Version="5.4.8" />
-    <PackageVersion Include="OpenAI" Version="2.10.0" />
+    <PackageVersion Include="OpenAI" Version="2.9.1" />
    <!-- Identity -->
    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.83.1" />
    <!-- Workflows -->
@@ -119,6 +126,7 @@
    <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.12.1" />
    <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" />
@@ -153,12 +153,6 @@
    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step22_MemorySearch/Agent_Step22_MemorySearch.csproj" />
    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step23_LocalMCP/Agent_Step23_LocalMCP.csproj" />
  </Folder>
-  <Folder Name="/Samples/02-agents/Evaluation/">
-    <Project Path="samples/02-agents/Evaluation/Evaluation_SimpleEval/Evaluation_SimpleEval.csproj" />
-    <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
-    <Project Path="samples/02-agents/Evaluation/Evaluation_ExpectedOutputs/Evaluation_ExpectedOutputs.csproj" />
-    <Project Path="samples/02-agents/Evaluation/Evaluation_Multimodal/Evaluation_Multimodal.csproj" />
-  </Folder>
  <Folder Name="/Samples/02-agents/AgentWithMemory/">
    <File Path="samples/02-agents/AgentWithMemory/README.md" />
    <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
@@ -249,9 +243,6 @@
  <Folder Name="/Samples/03-workflows/HumanInTheLoop/">
    <Project Path="samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj" />
  </Folder>
-  <Folder Name="/Samples/03-workflows/Orchestration/">
-    <Project Path="samples/03-workflows/Orchestration/Handoff/Handoff.csproj" />
-  </Folder>
  <Folder Name="/Samples/03-workflows/Observability/">
    <Project Path="samples/03-workflows/Observability/ApplicationInsights/ApplicationInsights.csproj" />
    <Project Path="samples/03-workflows/Observability/AspireDashboard/AspireDashboard.csproj" />
@@ -269,9 +260,6 @@
    <Project Path="samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/06_MixedWorkflowAgentsAndExecutors.csproj" />
    <Project Path="samples/03-workflows/_StartHere/07_WriterCriticWorkflow/07_WriterCriticWorkflow.csproj" />
  </Folder>
-  <Folder Name="/Samples/03-workflows/Evaluation/">
-    <Project Path="samples/03-workflows/Evaluation/Evaluation_WorkflowEval/Evaluation_WorkflowEval.csproj" />
-  </Folder>
  <Folder Name="/Samples/04-hosting/" />
  <Folder Name="/Samples/04-hosting/DurableAgents/" />
  <Folder Name="/Samples/04-hosting/DurableAgents/AzureFunctions/">
@@ -300,16 +288,11 @@
    <File Path="samples/04-hosting/A2A/README.md" />
    <Project Path="samples/04-hosting/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj" />
    <Project Path="samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj" />
-  </Folder>
+  </Folder>  
  <Folder Name="/Samples/05-end-to-end/">
    <Project Path="samples/05-end-to-end/AgentWithPurview/AgentWithPurview.csproj" />
    <Project Path="samples/05-end-to-end/M365Agent/M365Agent.csproj" />
  </Folder>
-  <Folder Name="/Samples/05-end-to-end/Evaluation/">
-    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_FoundryQuality/Evaluation_FoundryQuality.csproj" />
-    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_MixedProviders/Evaluation_MixedProviders.csproj" />
-    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_ConversationSplits/Evaluation_ConversationSplits.csproj" />
-  </Folder>
  <Folder Name="/Samples/05-end-to-end/A2AClientServer/">
    <File Path="samples/05-end-to-end/A2AClientServer/README.md" />
    <Project Path="samples/05-end-to-end/A2AClientServer/A2AClient/A2AClient.csproj" />
@@ -246,7 +246,7 @@ internal static class AgentsSamples
            ExpectedOutputDescription =
            [
                "The output should contain information about both the current time and the weather in Seattle.",
-                "The weather information should be similar to: cloudy with a high of 15°C. Exact phrasing may vary.",
+                "The weather information should reference the plugin result: cloudy with a high of 15°C.",
                "The output should not contain error messages or stack traces.",
            ],
        },
@@ -521,7 +521,7 @@ internal static class AgentsSamples
            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
            ExpectedOutputDescription =
            [
-                "The output should contain multiple joke responses showing a multi-turn conversation.",
+                "The output should demonstrate server-side conversation sessions with non-streaming and streaming turns.",
                "The output should not contain error messages or stack traces.",
            ],
        },
@@ -14,9 +14,6 @@
 //   dotnet run -- --log results.log                     # Write sequential log to file
 //   dotnet run -- --csv results.csv                     # Write CSV summary to file
 //   dotnet run -- --md results.md                       # Write Markdown summary to file
-//   dotnet run -- --build                                # Build samples during run (default: --no-build)
-// Note: By default, this tool expects sample build outputs to already exist.
-// Pre-build the solution before running, or pass --build to avoid missing build output failures.
 //
 // Required environment variables (for AI-powered samples):
 //   AZURE_OPENAI_ENDPOINT
@@ -66,7 +63,7 @@ try
    // Run all samples
    var reporter = new ConsoleReporter();
    var verifier = new SampleVerifier(chatClient);
-    var orchestrator = new VerificationOrchestrator(verifier, reporter, dotnetRoot, TimeSpan.FromMinutes(3), logWriter, buildSamples: options.BuildSamples);
+    var orchestrator = new VerificationOrchestrator(verifier, reporter, dotnetRoot, TimeSpan.FromMinutes(3), logWriter);

    var run = await orchestrator.RunAllAsync(options.Samples, options.MaxParallelism);

@@ -20,32 +20,23 @@ internal static class SampleRunner
 {
    /// <summary>
    /// Runs <c>dotnet run --framework net10.0</c> in the given project directory.
-    /// When <paramref name="build"/> is false (the default), <c>--no-build</c> is passed
-    /// to skip building, assuming the project was pre-built.
    /// </summary>
    public static Task<SampleRunResult> RunAsync(
        string projectPath,
        TimeSpan timeout,
-        bool build = false,
        CancellationToken cancellationToken = default)
-        => RunAsync(projectPath, DotnetRunArgs(build), timeout, inputs: null, inputDelayMs: 0, cancellationToken: cancellationToken);
+        => RunAsync(projectPath, "run --framework net10.0", timeout, inputs: null, inputDelayMs: 0, cancellationToken: cancellationToken);

    /// <summary>
    /// Runs <c>dotnet run --framework net10.0</c> with stdin inputs.
-    /// When <paramref name="build"/> is false (the default), <c>--no-build</c> is passed
-    /// to skip building, assuming the project was pre-built.
    /// </summary>
    public static Task<SampleRunResult> RunAsync(
        string projectPath,
        TimeSpan timeout,
        string?[]? inputs,
        int inputDelayMs = 2000,
-        bool build = false,
        CancellationToken cancellationToken = default)
-        => RunAsync(projectPath, DotnetRunArgs(build), timeout, inputs, inputDelayMs, cancellationToken);
-
-    private static string DotnetRunArgs(bool build) =>
-        $"run {(build ? "" : "--no-build")} --framework net10.0";
+        => RunAsync(projectPath, "run --framework net10.0", timeout, inputs, inputDelayMs, cancellationToken);

    /// <summary>
    /// Runs an arbitrary <c>dotnet</c> command in the given working directory.
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System.ComponentModel;
 using System.Text.Json.Serialization;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -28,19 +27,11 @@ internal sealed class SampleVerifier
                instructions: """
                    You are a test output verifier. You will be given:
                    1. The actual stdout output of a program
-                    2. The stderr output (if any)
-                    3. A list of expectations about what the output should contain or demonstrate
+                    2. A list of expectations about what the output should contain or demonstrate

                    Your job is to determine whether the actual output satisfies each expectation.
                    Be reasonable — the output comes from an LLM so exact wording won't match, but the
                    semantic intent should be clearly satisfied.
-
-                    In your response, you MUST:
-                    - Always provide ai_reasoning with a brief overall assessment.
-                    - Always provide exactly one entry in expectation_results for each expectation,
-                      in the same order as the input list.
-                    - For each expectation_results entry, echo the expectation text in the expectation
-                      field and explain your assessment in the detail field, citing evidence from the output.
                    """,
                name: "OutputVerifier");
        }
@@ -87,7 +78,7 @@ internal sealed class SampleVerifier
            }
            else
            {
-                var aiResult = await this.VerifyWithAIAsync(run.Stdout, run.Stderr, sample.ExpectedOutputDescription);
+                var aiResult = await this.VerifyWithAIAsync(run.Stdout, sample.ExpectedOutputDescription);
                aiReasoning = aiResult.Reasoning;

                foreach (var unmet in aiResult.UnmetExpectations)
@@ -109,28 +100,16 @@ internal sealed class SampleVerifier
    }

    private async Task<(string Reasoning, List<string> UnmetExpectations)> VerifyWithAIAsync(
-        string stdout,
-        string stderr,
+        string actualOutput,
        string[] expectations)
    {
        var expectationList = string.Join("\n", expectations.Select((e, i) => $"  {i + 1}. {e}"));
-
-        var stderrSection = string.IsNullOrWhiteSpace(stderr)
-            ? ""
-            : $"""
-
-                Stderr output:
-                ---
-                {Truncate(stderr, 2000)}
-                ---
-                """;
-
        var prompt = $"""
            Actual program output:
            ---
-            {Truncate(stdout, 4000)}
+            {Truncate(actualOutput, 4000)}
            ---
-            {stderrSection}
+
            Expectations to verify:
            {expectationList}

@@ -147,9 +126,7 @@ internal sealed class SampleVerifier
                return ($"AI verification returned null result. Raw: {response.Text}", ["AI verification returned null result."]);
            }

-            var reasoning = string.IsNullOrWhiteSpace(result.AIReasoning)
-                ? "(no reasoning provided)"
-                : result.AIReasoning;
+            var reasoning = result.Reasoning ?? "(no reasoning provided)";

            // Collect unmet expectations as individual failures
            var unmet = new List<string>();
@@ -197,14 +174,12 @@ internal sealed class AIVerificationResponse
    public bool Pass { get; set; }

    /// <summary>Brief explanation of the overall assessment.</summary>
-    [JsonPropertyName("ai_reasoning")]
-    [Description("Always required. Brief explanation of the overall assessment, covering all expectations.")]
-    public string AIReasoning { get; set; } = string.Empty;
+    [JsonPropertyName("reasoning")]
+    public string? Reasoning { get; set; }

    /// <summary>Per-expectation results.</summary>
    [JsonPropertyName("expectation_results")]
-    [Description("Always required. One entry per expectation, in the same order as the input list.")]
-    public List<ExpectationResult> ExpectationResults { get; set; } = [];
+    public List<ExpectationResult>? ExpectationResults { get; set; }
 }

 /// <summary>
@@ -215,8 +190,7 @@ internal sealed class ExpectationResult
 {
    /// <summary>The expectation text that was evaluated.</summary>
    [JsonPropertyName("expectation")]
-    [Description("Echo back the expectation text being evaluated.")]
-    public string Expectation { get; set; } = string.Empty;
+    public string? Expectation { get; set; }

    /// <summary>Whether this expectation was met.</summary>
    [JsonPropertyName("met")]
@@ -224,6 +198,5 @@ internal sealed class ExpectationResult

    /// <summary>Detail about how the expectation was or was not met.</summary>
    [JsonPropertyName("detail")]
-    [Description("Explain how the expectation was or was not met, citing specific evidence from the output.")]
-    public string Detail { get; set; } = string.Empty;
+    public string? Detail { get; set; }
 }
@@ -14,22 +14,19 @@ internal sealed class VerificationOrchestrator
    private readonly LogFileWriter? _logWriter;
    private readonly string _dotnetRoot;
    private readonly TimeSpan _timeout;
-    private readonly bool _buildSamples;

    public VerificationOrchestrator(
        SampleVerifier verifier,
        ConsoleReporter reporter,
        string dotnetRoot,
        TimeSpan timeout,
-        LogFileWriter? logWriter = null,
-        bool buildSamples = false)
+        LogFileWriter? logWriter = null)
    {
        this._verifier = verifier;
        this._reporter = reporter;
        this._logWriter = logWriter;
        this._dotnetRoot = dotnetRoot;
        this._timeout = timeout;
-        this._buildSamples = buildSamples;
    }

    /// <summary>
@@ -139,8 +136,8 @@ internal sealed class VerificationOrchestrator

            var projectPath = Path.Combine(this._dotnetRoot, sample.ProjectPath);
            var run = sample.Inputs.Length > 0
-                ? await SampleRunner.RunAsync(projectPath, this._timeout, sample.Inputs, sample.InputDelayMs, build: this._buildSamples)
-                : await SampleRunner.RunAsync(projectPath, this._timeout, build: this._buildSamples);
+                ? await SampleRunner.RunAsync(projectPath, this._timeout, sample.Inputs, sample.InputDelayMs)
+                : await SampleRunner.RunAsync(projectPath, this._timeout);

            log.Add($"[{sample.Name}] Completed ({run.Elapsed.TotalSeconds:F1}s, exit={run.ExitCode})");
            this._reporter.WriteLineWithPrefix(
@@ -27,12 +27,6 @@ internal sealed class VerifyOptions
    /// </summary>
    public string? LogFilePath { get; init; }

-    /// <summary>
-    /// When true, samples are built as part of <c>dotnet run</c>.
-    /// When false (the default), <c>--no-build</c> is passed, assuming a prior build step.
-    /// </summary>
-    public bool BuildSamples { get; init; }
-
    /// <summary>
    /// The filtered list of samples to process.
    /// </summary>
@@ -61,7 +55,6 @@ internal sealed class VerifyOptions
        var logFilePath = ExtractArg(argList, "--log");
        var csvFilePath = ExtractArg(argList, "--csv");
        var markdownFilePath = ExtractArg(argList, "--md");
-        var buildSamples = ExtractFlag(argList, "--build");

        int maxParallelism = 8;
        var parallelArg = ExtractArg(argList, "--parallel");
@@ -112,7 +105,6 @@ internal sealed class VerifyOptions
            LogFilePath = logFilePath,
            CsvFilePath = csvFilePath,
            MarkdownFilePath = markdownFilePath,
-            BuildSamples = buildSamples,
            Samples = samples,
        };
    }
@@ -136,16 +128,4 @@ internal sealed class VerifyOptions
        list.RemoveRange(idx, 2);
        return value;
    }
-
-    private static bool ExtractFlag(List<string> list, string flag)
-    {
-        var idx = list.IndexOf(flag);
-        if (idx < 0)
-        {
-            return false;
-        }
-
-        list.RemoveAt(idx);
-        return true;
-    }
 }
@@ -1,21 +1,21 @@
 <Project>
  <PropertyGroup>
    <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.1.0</VersionPrefix>
-    <RCNumber>1</RCNumber>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <RCNumber>6</RCNumber>
    <PackageVersion Condition="'$(IsReleaseCandidate)' == 'true'">$(VersionPrefix)-rc$(RCNumber)</PackageVersion>
-    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).260410.1</PackageVersion>
-    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.260410.1</PackageVersion>
+    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).260402.1</PackageVersion>
+    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.260402.1</PackageVersion>
    <PackageVersion Condition="'$(IsReleased)' == 'true'">$(VersionPrefix)</PackageVersion>
-    <GitTag>1.1.0</GitTag>
+    <GitTag>1.0.0</GitTag>

    <Configurations>Debug;Release;Publish</Configurations>
    <IsPackable>true</IsPackable>

    <!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
-    <PackageValidationBaselineVersion>1.0.0</PackageValidationBaselineVersion>
-    <!-- Enable validation for GA packages -->
-    <EnablePackageValidation Condition="'$(IsReleased)' == 'true'">true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>1.0.0-rc5</PackageValidationBaselineVersion>
+    <!-- Enable validation for RC packages and GA packages -->
+    <EnablePackageValidation Condition="'$(IsReleaseCandidate)' == 'true' OR '$(IsReleased)' == 'true'">true</EnablePackageValidation>
    <!-- Validate assembly attributes only for Publish builds -->
    <NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
    <!-- Do not validate reference assemblies -->
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -11,7 +11,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 [Description("Get the weather for a given location.")]
 static string GetWeather([Description("The location to get the weather for.")] string location)
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -16,7 +16,7 @@ using OpenAI.Chat;
 using SampleApp;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -8,7 +8,7 @@
 //
 // Environment variables:
 //   AZURE_OPENAI_ENDPOINT
-//   AZURE_OPENAI_DEPLOYMENT_NAME (defaults to "gpt-5.4-mini")
+//   AZURE_OPENAI_DEPLOYMENT_NAME (defaults to "gpt-4o-mini")
 //
 // Run with: func start
 // Then call: POST http://localhost:7071/api/agents/HostedAgent/run
@@ -23,7 +23,7 @@ using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")
    ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Set up an AI agent following the standard Microsoft Agent Framework pattern.
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -15,7 +15,7 @@ All samples require the following environment variables:

 ```bash
 export AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"
-export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 ```

 For the client samples, you can optionally set:
@@ -97,7 +97,7 @@ Console.WriteLine("""
    """);

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT environment variable is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Log application startup
 appLogger.LogInformation("OpenTelemetry Aspire Demo application started");
@@ -34,7 +34,7 @@ graph TD
 Set the following environment variables:
 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```

 **Note**: This demo uses Azure CLI credentials for authentication. Make sure you're logged in with `az login` and have access to the Azure OpenAI resource.
@@ -9,7 +9,7 @@ using Azure.Identity;
 using Microsoft.Agents.AI;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 const string JokerName = "Joker";
 const string JokerInstructions = "You are good at telling jokes.";
@@ -22,5 +22,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project" # Replace with your Microsoft Foundry resource endpoint
-$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -9,7 +9,7 @@ using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 const string JokerName = "JokerAgent";

@@ -22,5 +22,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project" # Replace with your Microsoft Foundry resource endpoint
-$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -12,5 +12,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -9,7 +9,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Responses;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -12,5 +12,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -8,7 +8,7 @@ using OpenAI;
 using OpenAI.Chat;

 var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 AIAgent agent = new OpenAIClient(
    apiKey)
@@ -9,5 +9,5 @@ Set the following environment variables:

 ```powershell
 $env:OPENAI_API_KEY="*****" # Replace with your OpenAI api key
-$env:OPENAI_CHAT_MODEL_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:OPENAI_CHAT_MODEL_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -7,7 +7,7 @@ using OpenAI;
 using OpenAI.Responses;

 var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 AIAgent agent = new OpenAIClient(
    apiKey)
@@ -9,5 +9,5 @@ Set the following environment variables:

 ```powershell
 $env:OPENAI_API_KEY="*****" # Replace with your OpenAI api key
-$env:OPENAI_CHAT_MODEL_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:OPENAI_CHAT_MODEL_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -16,7 +16,7 @@ using OpenAI.Responses;

 // --- Configuration ---
 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // --- Skills Provider ---
 // Discovers skills from the 'skills' directory containing SKILL.md files.
@@ -30,7 +30,7 @@ Converts between common units (miles↔km, pounds↔kg) using a multiplication f

 ```bash
 export AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 ```

 ### Run
@@ -16,7 +16,7 @@ using OpenAI.Responses;

 // --- Configuration ---
 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // --- Build the code-defined skill ---
 var unitConverterSkill = new AgentInlineSkill(
@@ -31,7 +31,7 @@ Converts between common units using multiplication factors. Defined entirely in

 ```bash
 export AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 ```

 ### Run
@@ -6,7 +6,7 @@

    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);MAAI001;IDE0051</NoWarn>
+    <NoWarn>$(NoWarn);MAAI001</NoWarn>
  </PropertyGroup>

  <ItemGroup>
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.

-// This sample demonstrates how to define Agent Skills as C# classes using AgentClassSkill
-// with attributes for automatic script and resource discovery.
+// This sample demonstrates how to define Agent Skills as C# classes using AgentClassSkill.
+// Class-based skills bundle all components into a single class implementation.

-using System.ComponentModel;
 using System.Text.Json;
 using Azure.AI.OpenAI;
 using Azure.Identity;
@@ -12,7 +11,7 @@ using OpenAI.Responses;

 // --- Configuration ---
 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // --- Class-Based Skill ---
 // Instantiate the skill class.
@@ -45,16 +44,17 @@ AgentResponse response = await agent.RunAsync(
 Console.WriteLine($"Agent: {response.Text}");

 /// <summary>
-/// A unit-converter skill defined as a C# class using attributes for discovery.
+/// A unit-converter skill defined as a C# class.
 /// </summary>
 /// <remarks>
-/// Properties annotated with <see cref="AgentSkillResourceAttribute"/> are automatically
-/// discovered as skill resources, and methods annotated with <see cref="AgentSkillScriptAttribute"/>
-/// are automatically discovered as skill scripts. Alternatively,
-/// <see cref="AgentSkill.Resources"/> and <see cref="AgentSkill.Scripts"/> can be overridden.
+/// Class-based skills bundle all components (name, description, body, resources, scripts)
+/// into a single class.
 /// </remarks>
-internal sealed class UnitConverterSkill : AgentClassSkill<UnitConverterSkill>
+internal sealed class UnitConverterSkill : AgentClassSkill
 {
+    private IReadOnlyList<AgentSkillResource>? _resources;
+    private IReadOnlyList<AgentSkillScript>? _scripts;
+
    /// <inheritdoc/>
    public override AgentSkillFrontmatter Frontmatter { get; } = new(
        "unit-converter",
@@ -69,40 +69,31 @@ internal sealed class UnitConverterSkill : AgentClassSkill<UnitConverterSkill>
        3. Present the result clearly with both units.
        """;

-    /// <summary>
-    /// Gets the <see cref="JsonSerializerOptions"/> used to marshal parameters and return values
-    /// for scripts and resources.
-    /// </summary>
-    /// <remarks>
-    /// This override is not necessary for this sample, but can be used to provide custom
-    /// serialization options, for example a source-generated <c>JsonTypeInfoResolver</c>
-    /// for Native AOT compatibility.
-    /// </remarks>
-    protected override JsonSerializerOptions? SerializerOptions => null;
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillResource>? Resources => this._resources ??=
+    [
+        CreateResource(
+            "conversion-table",
+            """
+            # Conversion Tables

-    /// <summary>
-    /// A conversion table resource providing multiplication factors.
-    /// </summary>
-    [AgentSkillResource("conversion-table")]
-    [Description("Lookup table of multiplication factors for common unit conversions.")]
-    public string ConversionTable => """
-        # Conversion Tables
+            Formula: **result = value × factor**

-        Formula: **result = value × factor**
+            | From        | To          | Factor   |
+            |-------------|-------------|----------|
+            | miles       | kilometers  | 1.60934  |
+            | kilometers  | miles       | 0.621371 |
+            | pounds      | kilograms   | 0.453592 |
+            | kilograms   | pounds      | 2.20462  |
+            """),
+    ];

-        | From        | To          | Factor   |
-        |-------------|-------------|----------|
-        | miles       | kilometers  | 1.60934  |
-        | kilometers  | miles       | 0.621371 |
-        | pounds      | kilograms   | 0.453592 |
-        | kilograms   | pounds      | 2.20462  |
-        """;
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillScript>? Scripts => this._scripts ??=
+    [
+        CreateScript("convert", ConvertUnits),
+    ];

-    /// <summary>
-    /// Converts a value by the given factor.
-    /// </summary>
-    [AgentSkillScript("convert")]
-    [Description("Multiplies a value by a conversion factor and returns the result as JSON.")]
    private static string ConvertUnits(double value, double factor)
    {
        double result = Math.Round(value * factor, 4);
@@ -1,16 +1,12 @@
 # Class-Based Agent Skills Sample

-This sample demonstrates how to define **Agent Skills as C# classes** using `AgentClassSkill`
-with **attributes** for automatic script and resource discovery.
+This sample demonstrates how to define **Agent Skills as C# classes** using `AgentClassSkill`.

 ## What it demonstrates

 - Creating skills as classes that extend `AgentClassSkill`
- Using `[AgentSkillResource]` on properties to define resources
- Using `[AgentSkillScript]` on methods to define scripts
- Automatic discovery (no need to override `Resources`/`Scripts`)
+- Bundling name, description, body, resources, and scripts into a single class
 - Using the `AgentSkillsProvider` constructor with class-based skills
- Overriding `SerializerOptions` for Native AOT compatibility

 ## Skills Included

@@ -32,7 +28,7 @@ A `UnitConverterSkill` class that converts between common units. Defined in `Pro

 ```bash
 export AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 ```

 ### Run
@@ -6,7 +6,7 @@

    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);MAAI001;IDE0051</NoWarn>
+    <NoWarn>$(NoWarn);MAAI001</NoWarn>
  </PropertyGroup>

  <ItemGroup>
@@ -8,12 +8,11 @@
 // Three different skill sources are registered here:
 // 1. File-based: unit-converter (miles↔km, pounds↔kg) from SKILL.md on disk
 // 2. Code-defined: volume-converter (gallons↔liters) using AgentInlineSkill
-// 3. Class-based: temperature-converter (°F↔°C↔K) using AgentClassSkill with attributes
+// 3. Class-based: temperature-converter (°F↔°C↔K) using AgentClassSkill
 //
 // For simpler, single-source scenarios, see the earlier steps in this sample series
 // (e.g., Step01 for file-based, Step02 for code-defined, Step03 for class-based).

-using System.ComponentModel;
 using System.Text.Json;
 using Azure.AI.OpenAI;
 using Azure.Identity;
@@ -23,7 +22,7 @@ using OpenAI.Responses;
 // --- Configuration ---
 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")
    ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // --- 1. Code-Defined Skill: volume-converter ---
 var volumeConverterSkill = new AgentInlineSkill(
@@ -90,15 +89,13 @@ AgentResponse response = await agent.RunAsync(
 Console.WriteLine($"Agent: {response.Text}");

 /// <summary>
-/// A temperature-converter skill defined as a C# class using attributes for discovery.
+/// A temperature-converter skill defined as a C# class.
 /// </summary>
-/// <remarks>
-/// Properties annotated with <see cref="AgentSkillResourceAttribute"/> are automatically
-/// discovered as skill resources, and methods annotated with <see cref="AgentSkillScriptAttribute"/>
-/// are automatically discovered as skill scripts.
-/// </remarks>
-internal sealed class TemperatureConverterSkill : AgentClassSkill<TemperatureConverterSkill>
+internal sealed class TemperatureConverterSkill : AgentClassSkill
 {
+    private IReadOnlyList<AgentSkillResource>? _resources;
+    private IReadOnlyList<AgentSkillScript>? _scripts;
+
    /// <inheritdoc/>
    public override AgentSkillFrontmatter Frontmatter { get; } = new(
        "temperature-converter",
@@ -113,27 +110,29 @@ internal sealed class TemperatureConverterSkill : AgentClassSkill<TemperatureCon
        3. Present the result clearly with both temperature scales.
        """;

-    /// <summary>
-    /// A reference table of temperature conversion formulas.
-    /// </summary>
-    [AgentSkillResource("temperature-conversion-formulas")]
-    [Description("Formulas for converting between Fahrenheit, Celsius, and Kelvin.")]
-    public string ConversionFormulas => """
-        # Temperature Conversion Formulas
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillResource>? Resources => this._resources ??=
+    [
+        CreateResource(
+            "temperature-conversion-formulas",
+            """
+            # Temperature Conversion Formulas

-        | From        | To          | Formula                   |
-        |-------------|-------------|---------------------------|
-        | Fahrenheit  | Celsius     | °C = (°F − 32) × 5/9     |
-        | Celsius     | Fahrenheit  | °F = (°C × 9/5) + 32     |
-        | Celsius     | Kelvin      | K = °C + 273.15           |
-        | Kelvin      | Celsius     | °C = K − 273.15           |
-        """;
+            | From        | To          | Formula                   |
+            |-------------|-------------|---------------------------|
+            | Fahrenheit  | Celsius     | °C = (°F − 32) × 5/9     |
+            | Celsius     | Fahrenheit  | °F = (°C × 9/5) + 32     |
+            | Celsius     | Kelvin      | K = °C + 273.15           |
+            | Kelvin      | Celsius     | °C = K − 273.15           |
+            """),
+    ];
+
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillScript>? Scripts => this._scripts ??=
+    [
+        CreateScript("convert-temperature", ConvertTemperature),
+    ];

-    /// <summary>
-    /// Converts a temperature value between scales.
-    /// </summary>
-    [AgentSkillScript("convert-temperature")]
-    [Description("Converts a temperature value from one scale to another.")]
    private static string ConvertTemperature(double value, string from, string to)
    {
        double result = (from.ToUpperInvariant(), to.ToUpperInvariant()) switch
@@ -45,7 +45,7 @@ Defined as `TemperatureConverterSkill` class in `Program.cs`. Converts °F↔°C

 ```bash
 export AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 ```

 ### Run
@@ -6,7 +6,7 @@

    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);MAAI001;CA1812;IDE0051</NoWarn>
+    <NoWarn>$(NoWarn);MAAI001;CA1812</NoWarn>
  </PropertyGroup>

  <ItemGroup>
@@ -13,7 +13,6 @@
 // showing that DI works identically regardless of how the skill is defined.
 // When prompted with a question spanning both domains, the agent uses both skills.

-using System.ComponentModel;
 using System.Text.Json;
 using Azure.AI.OpenAI;
 using Azure.Identity;
@@ -23,7 +22,7 @@ using OpenAI.Responses;

 // --- Configuration ---
 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // --- DI Container ---
 // Register application services that skill resources and scripts can resolve at execution time.
@@ -63,8 +62,8 @@ var distanceSkill = new AgentInlineSkill(
 // Approach 2: Class-Based Skill with DI (AgentClassSkill)
 // =====================================================================
 // Handles weight conversions (pounds ↔ kilograms).
-// Resources and scripts are discovered via reflection using attributes.
-// Methods with an IServiceProvider parameter receive DI automatically.
+// Resources and scripts are encapsulated in a class. Factory methods
+// CreateResource and CreateScript accept delegates with IServiceProvider.
 //
 // Alternatively, class-based skills can accept dependencies through their
 // constructor. Register the skill class itself in the ServiceCollection and
@@ -114,13 +113,14 @@ Console.WriteLine($"Agent: {response.Text}");
 /// </summary>
 /// <remarks>
 /// This skill resolves <see cref="ConversionService"/> from the DI container
-/// in both its resource and script methods. Methods with an <see cref="IServiceProvider"/>
-/// parameter are automatically injected by the framework. Properties and methods annotated
-/// with <see cref="AgentSkillResourceAttribute"/> and <see cref="AgentSkillScriptAttribute"/>
-/// are automatically discovered via reflection.
+/// in both its resource and script functions. This enables clean separation of
+/// concerns and testability while retaining the class-based skill pattern.
 /// </remarks>
-internal sealed class WeightConverterSkill : AgentClassSkill<WeightConverterSkill>
+internal sealed class WeightConverterSkill : AgentClassSkill
 {
+    private IReadOnlyList<AgentSkillResource>? _resources;
+    private IReadOnlyList<AgentSkillScript>? _scripts;
+
    /// <inheritdoc/>
    public override AgentSkillFrontmatter Frontmatter { get; } = new(
        "weight-converter",
@@ -135,27 +135,25 @@ internal sealed class WeightConverterSkill : AgentClassSkill<WeightConverterSkil
        3. Present the result clearly with both units.
        """;

-    /// <summary>
-    /// Returns the weight conversion table from the DI-registered <see cref="ConversionService"/>.
-    /// </summary>
-    [AgentSkillResource("weight-table")]
-    [Description("Lookup table of multiplication factors for weight conversions.")]
-    private static string GetWeightTable(IServiceProvider serviceProvider)
-    {
-        var service = serviceProvider.GetRequiredService<ConversionService>();
-        return service.GetWeightTable();
-    }
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillResource>? Resources => this._resources ??=
+    [
+        CreateResource("weight-table", (IServiceProvider serviceProvider) =>
+        {
+            var service = serviceProvider.GetRequiredService<ConversionService>();
+            return service.GetWeightTable();
+        }),
+    ];

-    /// <summary>
-    /// Converts a value by the given factor using the DI-registered <see cref="ConversionService"/>.
-    /// </summary>
-    [AgentSkillScript("convert")]
-    [Description("Multiplies a value by a conversion factor and returns the result as JSON.")]
-    private static string Convert(double value, double factor, IServiceProvider serviceProvider)
-    {
-        var service = serviceProvider.GetRequiredService<ConversionService>();
-        return service.Convert(value, factor);
-    }
+    /// <inheritdoc/>
+    public override IReadOnlyList<AgentSkillScript>? Scripts => this._scripts ??=
+    [
+        CreateScript("convert", (double value, double factor, IServiceProvider serviceProvider) =>
+        {
+            var service = serviceProvider.GetRequiredService<ConversionService>();
+            return service.Convert(value, factor);
+        }),
+    ];
 }

 // ---------------------------------------------------------------------------
@@ -45,7 +45,7 @@ Set the following environment variables:
 | Variable | Description |
 |---|---|
 | `AZURE_OPENAI_ENDPOINT` | Your Azure OpenAI endpoint URL |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Model deployment name (defaults to `gpt-5.4-mini`) |
+| `AZURE_OPENAI_DEPLOYMENT_NAME` | Model deployment name (defaults to `gpt-4o-mini`) |

 ## Running the Sample

@@ -12,7 +12,7 @@ using Microsoft.SemanticKernel.Connectors.InMemory;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var embeddingDeploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-3-large";

 // Create a vector store to store the chat messages in.
@@ -14,7 +14,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 var mem0ServiceUri = Environment.GetEnvironmentVariable("MEM0_ENDPOINT") ?? throw new InvalidOperationException("MEM0_ENDPOINT is not set.");
 var mem0ApiKey = Environment.GetEnvironmentVariable("MEM0_API_KEY") ?? throw new InvalidOperationException("MEM0_API_KEY is not set.");
@@ -15,7 +15,7 @@ using Microsoft.Agents.AI.Foundry;

 string foundryEndpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
 string memoryStoreName = Environment.GetEnvironmentVariable("AZURE_AI_MEMORY_STORE_ID") ?? "memory-store-sample";
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 string embeddingModelName = Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-ada-002";

 // Create an AIProjectClient for Foundry with Azure Identity authentication.
@@ -14,7 +14,7 @@ This sample demonstrates how to create and run an agent that uses Microsoft Foun
 ## Prerequisites

 1. Azure subscription with Microsoft Foundry project
-2. Azure OpenAI resource with a chat model deployment (e.g., gpt-5.4-mini) and an embedding model deployment (e.g., text-embedding-ada-002)
+2. Azure OpenAI resource with a chat model deployment (e.g., gpt-4o-mini) and an embedding model deployment (e.g., text-embedding-ada-002)
 3. .NET 10.0 SDK
 4. Azure CLI logged in (`az login`)

@@ -26,7 +26,7 @@ export AZURE_AI_PROJECT_ENDPOINT="https://your-account.services.ai.azure.com/api
 export AZURE_AI_MEMORY_STORE_ID="my_memory_store"

 # Model deployment names (models deployed in your Foundry project)
-export AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"
+export AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-4o-mini"
 export AZURE_AI_EMBEDDING_DEPLOYMENT_NAME="text-embedding-ada-002"
 ```

@@ -15,7 +15,7 @@ using OpenAI.Chat;
 using SampleApp;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var embeddingDeploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-3-large";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -13,7 +13,7 @@ This sample demonstrates how to create a custom `ChatHistoryProvider` that keeps

 - [.NET 10 SDK](https://dotnet.microsoft.com/download/dotnet/10.0)
 - An Azure OpenAI resource with:
-  - A chat deployment (e.g., `gpt-5.4-mini`)
+  - A chat deployment (e.g., `gpt-4o-mini`)
  - An embedding deployment (e.g., `text-embedding-3-large`)

 ## Configuration
@@ -23,7 +23,7 @@ Set the following environment variables:
 | Variable | Description | Default |
 |---|---|---|
 | `AZURE_OPENAI_ENDPOINT` | Your Azure OpenAI endpoint URL | *(required)* |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Chat model deployment name | `gpt-5.4-mini` |
+| `AZURE_OPENAI_DEPLOYMENT_NAME` | Chat model deployment name | `gpt-4o-mini` |
 | `AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME` | Embedding model deployment name | `text-embedding-3-large` |

 ## Running the Sample
@@ -7,7 +7,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Responses;

 var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 AIAgent agent =
    new ResponsesClient(new ApiKeyCredential(apiKey))
@@ -7,7 +7,7 @@ using Microsoft.Extensions.AI;
 using OpenAI;

 var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5";

 var client = new OpenAIClient(apiKey)
        .GetResponsesClient()
@@ -7,7 +7,7 @@ using OpenAI.Chat;
 using OpenAIChatClientSample;

 string apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-string model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+string model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 // Create a ChatClient directly from OpenAIClient
 ChatClient chatClient = new OpenAIClient(apiKey).GetChatClient(model);
@@ -13,7 +13,7 @@ This sample demonstrates how to create an AI agent directly from an `OpenAI.Chat
 1. Set the required environment variables:
   ```bash
   set OPENAI_API_KEY=your_api_key_here
-   set OPENAI_CHAT_MODEL_NAME=gpt-5.4-mini
+   set OPENAI_CHAT_MODEL_NAME=gpt-4o-mini
   ```

 2. Run the sample:
@@ -7,7 +7,7 @@ using OpenAI.Responses;
 using OpenAIResponseClientSample;

 var apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+var model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 // Create a ResponsesClient directly from OpenAIClient
 ResponsesClient responseClient = new OpenAIClient(apiKey).GetResponsesClient();
@@ -13,7 +13,7 @@ This sample demonstrates how to create an AI agent directly from an `OpenAI.Resp
 1. Set the required environment variables:
   ```bash
   set OPENAI_API_KEY=your_api_key_here
-   set OPENAI_CHAT_MODEL_NAME=gpt-5.4-mini
+   set OPENAI_CHAT_MODEL_NAME=gpt-4o-mini
   ```

 2. Run the sample:
@@ -15,7 +15,7 @@ using OpenAI.Chat;
 using OpenAI.Conversations;

 string apiKey = Environment.GetEnvironmentVariable("OPENAI_API_KEY") ?? throw new InvalidOperationException("OPENAI_API_KEY is not set.");
-string model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-5.4-mini";
+string model = Environment.GetEnvironmentVariable("OPENAI_CHAT_MODEL_NAME") ?? "gpt-4o-mini";

 // Create a ConversationClient directly from OpenAIClient
 OpenAIClient openAIClient = new(apiKey);
@@ -69,7 +69,7 @@ foreach (ClientResult result in getConversationItemsResults.GetRawPages())
 1. Set the required environment variables:
   ```powershell
   $env:OPENAI_API_KEY = "your_api_key_here"
-   $env:OPENAI_CHAT_MODEL_NAME = "gpt-5.4-mini"
+   $env:OPENAI_CHAT_MODEL_NAME = "gpt-4o-mini"
   ```

 2. Run the sample:
@@ -15,7 +15,7 @@ using Microsoft.SemanticKernel.Connectors.InMemory;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var embeddingDeploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-3-large";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -14,7 +14,7 @@ using OpenAI.Chat;
 using Qdrant.Client;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var embeddingDeploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-3-large";
 var afOverviewUrl = "https://raw.githubusercontent.com/MicrosoftDocs/semantic-kernel-docs/refs/heads/main/agent-framework/overview/index.md";
 var afMigrationUrl = "https://raw.githubusercontent.com/MicrosoftDocs/semantic-kernel-docs/refs/heads/main/agent-framework/migration-guide/from-semantic-kernel/index.md";
@@ -23,7 +23,7 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 $env:AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME="text-embedding-3-large"  # Optional, defaults to text-embedding-3-large
 ```

@@ -13,7 +13,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 TextSearchProviderOptions textSearchOptions = new()
 {
@@ -14,7 +14,7 @@ using OpenAI.Responses;
 using OpenAI.VectorStores;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create an AI Project client and get an OpenAI client that works with the foundry service.
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -8,7 +8,7 @@ using Neo4j.AgentFramework.GraphRAG;
 using Neo4j.Driver;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var neo4jUri = Environment.GetEnvironmentVariable("NEO4J_URI") ?? throw new InvalidOperationException("NEO4J_URI is not set.");
 var neo4jUsername = Environment.GetEnvironmentVariable("NEO4J_USERNAME") ?? "neo4j";
 var neo4jPassword = Environment.GetEnvironmentVariable("NEO4J_PASSWORD") ?? throw new InvalidOperationException("NEO4J_PASSWORD is not set.");
@@ -15,7 +15,7 @@ The sample uses a Neo4j fulltext index for retrieval and a Cypher `RetrievalQuer

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"
 $env:NEO4J_URI="neo4j+s://your-instance.databases.neo4j.io"
 $env:NEO4J_USERNAME="neo4j"
 $env:NEO4J_PASSWORD="your-password"
@@ -14,7 +14,7 @@ using OpenAI.Chat;
 using ChatMessage = Microsoft.Extensions.AI.ChatMessage;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create a sample function tool that the agent can use.
 [Description("Get the weather for a given location.")]
@@ -14,7 +14,7 @@ using SampleApp;
 using ChatMessage = Microsoft.Extensions.AI.ChatMessage;

 string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create chat client to be used by chat client agents.
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -28,7 +28,7 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```

 ## Run the sample
@@ -11,7 +11,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create the agent
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -18,7 +18,7 @@ using SampleApp;
 using ChatMessage = Microsoft.Extensions.AI.ChatMessage;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create a vector store to store the chat messages in.
 // Replace this with a vector store implementation of your choice if you want to persist the chat history to disk.
@@ -11,7 +11,7 @@ using OpenTelemetry;
 using OpenTelemetry.Trace;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var applicationInsightsConnectionString = Environment.GetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING");

 // Create TracerProvider with console exporter
@@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create a host builder that we will register services with and then run.
 HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Hosting;
 using ModelContextProtocol.Server;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -22,7 +22,7 @@ To use the [MCP Inspector](https://modelcontextprotocol.io/docs/tools/inspector)
 1. Open a web browser and navigate to the URL displayed in the terminal. If not opened automatically, this will open the MCP Inspector interface.
 1. In the MCP Inspector interface, add the following environment variables to allow your MCP server to access Microsoft Foundry Project to create and run the agent:
    - AZURE_AI_PROJECT_ENDPOINT = https://your-resource.openai.azure.com/ # Replace with your Microsoft Foundry Project endpoint
-    - AZURE_AI_MODEL_DEPLOYMENT_NAME = gpt-5.4-mini # Replace with your model deployment name
+    - AZURE_AI_MODEL_DEPLOYMENT_NAME = gpt-4o-mini # Replace with your model deployment name
 1. Find and click the `Connect` button in the MCP Inspector interface to connect to the MCP server.
 1. As soon as the connection is established, open the `Tools` tab in the MCP Inspector interface and select the `Joker` tool from the list.
 1. Specify your prompt as a value for the `query` argument, for example: `Tell me a joke about a pirate` and click the `Run Tool` button to run the tool.
@@ -9,7 +9,7 @@ using OpenAI.Chat;
 using ChatMessage = Microsoft.Extensions.AI.ChatMessage;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -20,7 +20,7 @@ This sample demonstrates how to use image multi-modality with an AI agent. It sh
 Before running this sample, ensure you have:

 1. An Azure OpenAI project set up
-2. A compatible model deployment (e.g., gpt-5.4-mini)
+2. A compatible model deployment (e.g., gpt-4o)
 3. Azure CLI installed and authenticated

 ## Environment Variables
@@ -29,7 +29,7 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini" # Replace with your model deployment name (optional, defaults to gpt-5.4-mini)
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o" # Replace with your model deployment name (optional, defaults to gpt-4o)
 ```

 ## Run the sample
@@ -10,7 +10,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 [Description("Get the weather for a given location.")]
 static string GetWeather([Description("The location to get the weather for.")] string location)
@@ -15,7 +15,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Responses;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5";

 var stateStore = new Dictionary<string, JsonElement?>();

@@ -24,5 +24,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5"  # Optional, defaults to gpt-5
 ```
@@ -15,7 +15,7 @@ using Microsoft.Extensions.AI;

 // Get Microsoft Foundry configuration from environment variables
 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o";

 // Get a client to create/retrieve server side agents with
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -27,7 +27,7 @@ Attempting to use function middleware on agents that do not wrap a ChatClientAge

 1. Environment variables:
   - `AZURE_OPENAI_ENDPOINT`: Your Azure OpenAI endpoint
-   - `AZURE_OPENAI_DEPLOYMENT_NAME`: Chat deployment name (optional; defaults to `gpt-5.4-mini`)
+   - `AZURE_OPENAI_DEPLOYMENT_NAME`: Chat deployment name (optional; defaults to `gpt-4o`)
 2. Sign in with Azure CLI (PowerShell):
   ```powershell
   az login
@@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create a service collection to hold the agent plugin and its dependencies.
 ServiceCollection services = new();
@@ -12,7 +12,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Construct the agent, and provide a factory to create an in-memory chat message store with a reducer that keeps only the last 2 non-system messages.
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI;
 using OpenAI.Responses;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -23,5 +23,5 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```
@@ -10,7 +10,7 @@ using Microsoft.Agents.AI;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
 var deepResearchDeploymentName = Environment.GetEnvironmentVariable("AZURE_AI_REASONING_DEPLOYMENT_NAME") ?? "o3-deep-research";
-var modelDeploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var modelDeploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o";
 var bingConnectionId = Environment.GetEnvironmentVariable("AZURE_AI_BING_CONNECTION_ID") ?? throw new InvalidOperationException("AZURE_AI_BING_CONNECTION_ID is not set.");

 // Configure extended network timeout for long-running Deep Research tasks.
@@ -13,7 +13,7 @@ Before running this sample, ensure you have:

 1. A Microsoft Foundry project set up
 2. A deep research model deployment (e.g., o3-deep-research)
-3. A model deployment (e.g., gpt-5.4-mini)
+3. A model deployment (e.g., gpt-4o)
 4. A Bing Connection configured in your Microsoft Foundry project
 5. Azure CLI installed and authenticated

@@ -45,5 +45,5 @@ $env:AZURE_AI_BING_CONNECTION_ID="/subscriptions/<sub-id>/resourceGroups/<rg>/pr
 # Optional, defaults to o3-deep-research
 $env:AZURE_AI_REASONING_DEPLOYMENT_NAME="o3-deep-research"

-# Optional, defaults to gpt-5.4-mini
-$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"
+# Optional, defaults to gpt-4o
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-4o"
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // Create the chat client
 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -18,7 +18,7 @@ using SampleApp;
 using MEAI = Microsoft.Extensions.AI;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5-mini";

 // A sample function to load the next three calendar events for the user.
 Func<Task<string[]>> loadNextThreeCalendarEvents = async () =>
@@ -16,7 +16,7 @@ using Microsoft.Agents.AI.Compaction;
 using Microsoft.Extensions.AI;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
 // In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
@@ -68,7 +68,7 @@ Order strategies from **least aggressive** to **most aggressive**. The pipeline

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"  # Required
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"                      # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"                       # Optional, defaults to gpt-4o-mini
 ```

 ## Running the Sample
@@ -110,7 +110,7 @@ IEnumerable<ChatMessage> compacted = await CompactionProvider.CompactAsync(
 The `SummarizationCompactionStrategy` accepts any `IChatClient`. Use a smaller, cheaper model to reduce summarization cost:

 ```csharp
-IChatClient summarizerChatClient = openAIClient.GetChatClient("gpt-5.4-mini").AsIChatClient();
+IChatClient summarizerChatClient = openAIClient.GetChatClient("gpt-4o-mini").AsIChatClient();
 new SummarizationCompactionStrategy(summarizerChatClient, CompactionTriggers.TokensExceed(4000))
 ```

@@ -23,7 +23,7 @@ using Microsoft.Extensions.AI;
 using OpenAI.Responses;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-4o-mini";
 var store = Environment.GetEnvironmentVariable("AZURE_OPENAI_RESPONSES_STORE") ?? "false";

 // WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
@@ -45,7 +45,7 @@ ChatClientAgent

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"  # Required
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"                      # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"                       # Optional, defaults to gpt-4o-mini
 ```

 ## Running the Sample
@@ -59,7 +59,7 @@ Set the following environment variables:

 ```powershell
 $env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/" # Replace with your Azure OpenAI resource endpoint
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini"  # Optional, defaults to gpt-4o-mini
 ```

 If the variables are not set, you will be prompted for the values when running the samples.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jacob AlberandGitHub	175e8e15a4	Merge branch 'main' into dev/dotnet_workflow/fix_concurrent_sample	2026-04-07 07:51:58 -04:00
Jacob AlberandGitHub	f804646239	Merge branch 'main' into dev/dotnet_workflow/fix_concurrent_sample	2026-04-03 20:01:20 -04:00
Jacob Alber	073114d2c1	refactor: Update Concurrent sample to use message delivery event callback	2026-04-03 17:52:43 -04:00
Jacob Alber	00adc5bf9e	fix: Concurrent Workflow Sample * Switch to using Azure AI Projects APIs * Remove agent streaming outputs by changing emitEvents to false on TurnToken * Disable forwarding input from agent host executors * Make output format more legible	2026-04-03 17:51:57 -04:00