Merge branch 'main' into feature-xunit3-mtp-upgrade

2026-06-16 21:04:09 +08:00 · 2026-03-05 12:23:01 +00:00 · 2026-03-05 11:33:00 +00:00 · 2026-03-04 19:09:22 +00:00 · 2026-03-04 17:40:24 +00:00 · 2026-03-04 15:30:47 +00:00
120 changed files with 732 additions and 427 deletions
@@ -59,20 +59,20 @@ jobs:
        if: steps.filter.outputs.dotnet != 'true'
        run: echo "NOT dotnet file"

-  dotnet-build-and-test:
+  # Build the full solution (including samples) on all TFMs. No tests.
+  dotnet-build:
    needs: paths-filter
    if: needs.paths-filter.outputs.dotnetChanges == 'true'
    strategy:
      fail-fast: false
      matrix:
        include:
-          - { targetFramework: "net10.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
+          - { targetFramework: "net10.0", os: "ubuntu-latest", configuration: Release }
          - { targetFramework: "net9.0", os: "windows-latest", configuration: Debug }
          - { targetFramework: "net8.0", os: "ubuntu-latest", configuration: Release }
-          - { targetFramework: "net472", os: "windows-latest", configuration: Release, integration-tests: true, environment: "integration" }
+          - { targetFramework: "net472", os: "windows-latest", configuration: Release }

    runs-on: ${{ matrix.os }}
-    environment: ${{ matrix.environment }}
    steps:
      - uses: actions/checkout@v6
        with:
@@ -84,16 +84,6 @@ jobs:
              python
              workflow-samples

-      # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
-      - name: Start Azure Cosmos DB Emulator
-        if: ${{ runner.os == 'Windows' && (needs.paths-filter.outputs.cosmosDbChanges == 'true' || (github.event_name != 'pull_request' && matrix.integration-tests)) }}
-        shell: pwsh
-        run: |
-          Write-Host "Launching Azure Cosmos DB Emulator"
-          Import-Module "$env:ProgramFiles\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
-          Start-CosmosDbEmulator -NoUI -Key "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-          echo "COSMOSDB_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
-
      - name: Setup dotnet
        uses: actions/setup-dotnet@v5.1.0
        with:
@@ -140,25 +130,98 @@ jobs:
          popd
          rm -rf "$TEMP_DIR"

-      - name: Run Unit Tests
-        shell: bash
-        run: |
-          export UT_PROJECTS=$(find ./dotnet -type f -name "*.UnitTests.csproj" | tr '\n' ' ')
-          for project in $UT_PROJECTS; do
-            # Query the project's target frameworks using MSBuild with the current configuration
-            target_frameworks=$(dotnet msbuild $project -getProperty:TargetFrameworks -p:Configuration=${{ matrix.configuration }} -nologo 2>/dev/null | tr -d '\r')
+  # Build src+tests only (no samples) for a single TFM and run tests.
+  dotnet-test:
+    needs: paths-filter
+    if: needs.paths-filter.outputs.dotnetChanges == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { targetFramework: "net10.0", os: "ubuntu-latest", configuration: Release, integration-tests: true, environment: "integration" }
+          - { targetFramework: "net472", os: "windows-latest", configuration: Release, integration-tests: true, environment: "integration" }

-            # Check if the project supports the target framework
-            if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              if [[ "${{ matrix.targetFramework }}" == "${{ env.COVERAGE_FRAMEWORK }}" ]]; then
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
-              else
-                dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
-              fi
-            else
-              echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
-            fi
-          done
+    runs-on: ${{ matrix.os }}
+    environment: ${{ matrix.environment }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+            persist-credentials: false
+            sparse-checkout: |
+              .
+              .github
+              dotnet
+              python
+              workflow-samples
+
+      # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
+      - name: Start Azure Cosmos DB Emulator
+        if: ${{ runner.os == 'Windows' && (needs.paths-filter.outputs.cosmosDbChanges == 'true' || (github.event_name != 'pull_request' && matrix.integration-tests)) }}
+        shell: pwsh
+        run: |
+          Write-Host "Launching Azure Cosmos DB Emulator"
+          Import-Module "$env:ProgramFiles\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
+          Start-CosmosDbEmulator -NoUI -Key "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
+          echo "COSMOSDB_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v5.1.0
+        with:
+          global-json-file: ${{ github.workspace }}/dotnet/global.json
+
+      - name: Generate test solution (no samples)
+        shell: pwsh
+        run: |
+          ./dotnet/eng/scripts/New-FilteredSolution.ps1 `
+            -Solution dotnet/agent-framework-dotnet.slnx `
+            -TargetFramework ${{ matrix.targetFramework }} `
+            -Configuration ${{ matrix.configuration }} `
+            -ExcludeSamples `
+            -OutputPath dotnet/filtered.slnx `
+            -Verbose
+
+      - name: Build src and tests
+        shell: bash
+        run: dotnet build dotnet/filtered.slnx -c ${{ matrix.configuration }} -f ${{ matrix.targetFramework }} --warnaserror
+
+      - name: Generate test-type filtered solutions
+        shell: pwsh
+        run: |
+          $commonArgs = @{
+            Solution       = "dotnet/filtered.slnx"
+            TargetFramework = "${{ matrix.targetFramework }}"
+            Configuration   = "${{ matrix.configuration }}"
+            Verbose         = $true
+          }
+          ./dotnet/eng/scripts/New-FilteredSolution.ps1 @commonArgs `
+            -TestProjectNameFilter "*UnitTests*" `
+            -OutputPath dotnet/filtered-unit.slnx
+          ./dotnet/eng/scripts/New-FilteredSolution.ps1 @commonArgs `
+            -TestProjectNameFilter "*IntegrationTests*" `
+            -OutputPath dotnet/filtered-integration.slnx
+
+      - name: Run Unit Tests
+        shell: pwsh
+        working-directory: dotnet
+        run: |
+          $coverageSettings = Join-Path $PWD "tests/coverage.runsettings"
+          $coverageArgs = @()
+          if ("${{ matrix.targetFramework }}" -eq "${{ env.COVERAGE_FRAMEWORK }}") {
+            $coverageArgs = @(
+              "--coverage",
+              "--coverage-output-format", "cobertura",
+              "--coverage-settings", $coverageSettings,
+              "--results-directory", "../TestResults/Coverage/"
+            )
+          }
+
+          dotnet test --solution ./filtered-unit.slnx `
+            -f ${{ matrix.targetFramework }} `
+            -c ${{ matrix.configuration }} `
+            --no-build -v Normal `
+            --report-xunit-trx `
+            --ignore-exit-code 8 `
+            @coverageArgs
        env:
          # Cosmos DB Emulator connection settings
          COSMOSDB_ENDPOINT: https://localhost:8081
@@ -185,21 +248,19 @@ jobs:
        id: azure-functions-setup

      - name: Run Integration Tests
-        shell: bash
+        shell: pwsh
+        working-directory: dotnet
        if: github.event_name != 'pull_request' && matrix.integration-tests
        run: |
-          export INTEGRATION_TEST_PROJECTS=$(find ./dotnet -type f -name "*IntegrationTests.csproj" | tr '\n' ' ')
-          for project in $INTEGRATION_TEST_PROJECTS; do
-            # Query the project's target frameworks using MSBuild with the current configuration
-            target_frameworks=$(dotnet msbuild $project -getProperty:TargetFrameworks -p:Configuration=${{ matrix.configuration }} -nologo 2>/dev/null | tr -d '\r')
-
-            # Check if the project supports the target framework
-            if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --filter "Category!=IntegrationDisabled"
-            else
-              echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
-            fi
-          done
+          dotnet test --solution ./filtered-integration.slnx `
+            -f ${{ matrix.targetFramework }} `
+            -c ${{ matrix.configuration }} `
+            --no-build -v Normal `
+            --report-xunit-trx `
+            --ignore-exit-code 8 `
+            --filter-not-trait "Category=IntegrationDisabled" `
+            --parallel-algorithm aggressive `
+            --max-threads 2.0x
        env:
          # Cosmos DB Emulator connection settings
          COSMOSDB_ENDPOINT: https://localhost:8081
@@ -222,7 +283,7 @@ jobs:
        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
        uses: danielpalme/ReportGenerator-GitHub-Action@5.5.1
        with:
-          reports: "./TestResults/Coverage/**/coverage.cobertura.xml"
+          reports: "./TestResults/Coverage/**/*.cobertura.xml"
          targetdir: "./TestResults/Reports"
          reporttypes: "HtmlInline;JsonSummary"

@@ -236,13 +297,13 @@ jobs:
      - name: Check coverage
        if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
        shell: pwsh
-        run: .github/workflows/dotnet-check-coverage.ps1 -JsonReportPath "TestResults/Reports/Summary.json" -CoverageThreshold $env:COVERAGE_THRESHOLD
+        run: ./dotnet/eng/scripts/dotnet-check-coverage.ps1 -JsonReportPath "TestResults/Reports/Summary.json" -CoverageThreshold $env:COVERAGE_THRESHOLD

  # This final job is required to satisfy the merge queue. It must only run (or succeed) if no tests failed
  dotnet-build-and-test-check:
    if: always()
    runs-on: ubuntu-latest
-    needs: [dotnet-build-and-test]
+    needs: [dotnet-build, dotnet-test]
    steps:
      - name: Get Date
        shell: bash
@@ -17,14 +17,17 @@ dotnet format             # Auto-fix formatting for all projects

 # Build/test/format a specific project (preferred for isolated/internal changes)
 dotnet build src/Microsoft.Agents.AI.<Package> --tl:off
-dotnet test tests/Microsoft.Agents.AI.<Package>.UnitTests
+dotnet test --project tests/Microsoft.Agents.AI.<Package>.UnitTests
 dotnet format src/Microsoft.Agents.AI.<Package>

 # Run a single test
-dotnet test --filter "FullyQualifiedName~Namespace.TestClassName.TestMethodName"
+# Replace the filter values with the appropriate assembly, namespace, class, and method names for the test you want to run and use * as a wildcard elsewhere, e.g. "/*/*/HttpClientTests/GetAsync_ReturnsSuccessStatusCode"
+# Use `--ignore-exit-code 8` to avoid failing the build when no tests are found for some projects
+dotnet test --filter-query "/<assemblyFilter>/<namespaceFilter>/<classFilter>/<methodFilter>" --ignore-exit-code 8

 # Run unit tests only
-dotnet test --filter FullyQualifiedName\~UnitTests
+# Use `--ignore-exit-code 8` to avoid failing the build when no tests are found for integration test projects
+dotnet test --filter-query "/*UnitTests*/*/*/*" --ignore-exit-code 8
 ```

 Use `--tl:off` when building to avoid flickering when running commands in the agent.
@@ -56,7 +59,7 @@ Example: Running tests for a single project using .NET 10.

 ```bash
 # From dotnet/ directory
-dotnet test ./tests/Microsoft.Agents.AI.Abstractions.UnitTests -f net10.0
+dotnet test --project ./tests/Microsoft.Agents.AI.Abstractions.UnitTests -f net10.0
 ```

 Example: Running a single test in a specific project using .NET 10.
@@ -64,7 +67,7 @@ Provide the full namespace, class name, and method name for the test you want to

 ```bash
 # From dotnet/ directory
-dotnet test ./tests/Microsoft.Agents.AI.Abstractions.UnitTests -f net10.0 --filter "FullyQualifiedName~Microsoft.Agents.AI.Abstractions.UnitTests.AgentRunOptionsTests.CloningConstructorCopiesProperties"
+dotnet test --project ./tests/Microsoft.Agents.AI.Abstractions.UnitTests -f net10.0 --filter-query "/*/Microsoft.Agents.AI.Abstractions.UnitTests/AgentRunOptionsTests/CloningConstructorCopiesProperties"
 ```

 ### Multi-target framework tip
@@ -83,3 +86,45 @@ Just remember to run `dotnet restore` after pulling changes, making changes to p
 Unit tests target both .NET Framework as well as .NET Core. When running on Linux, only the .NET Core tests can be run, as .NET Framework is not supported on Linux.

 To run only the .NET Core tests, use the `-f net10.0` option with `dotnet test`.
+
+### Microsoft Testing Platform (MTP)
+
+Tests use the [Microsoft Testing Platform](https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-intro) via xUnit v3. Key differences from the legacy VSTest runner:
+
+- **`dotnet test` requires `--project`** to specify a test project directly (positional arguments are no longer supported).
+- **Test output** uses the MTP format (e.g., `[✓112/x0/↓0]` progress and `Test run summary: Passed!`).
+- **TRX reports** use `--report-xunit-trx` instead of `--logger trx`.
+- **Code coverage** uses `Microsoft.Testing.Extensions.CodeCoverage` with `--coverage --coverage-output-format cobertura`.
+- **Running a test project directly** is supported via `dotnet run --project <test-project>`. This bypasses the `dotnet test` infrastructure and runs the test executable directly with the MTP command line.
+
+- **Running tests across the solution** with a filter may cause some projects to match zero tests, which MTP treats as a failure (exit code 8). Use `--ignore-exit-code 8` to suppress this:
+
+```bash
+# Run all unit tests across the solution, ignoring projects with no matching tests
+dotnet test --solution ./agent-framework-dotnet.slnx --no-build -f net10.0 --ignore-exit-code 8
+```
+
+- **Running tests with `--solution` for a specific TFM** requires all projects in the solution to support that TFM. Not all projects target every framework (e.g., some are `net10.0`-only). Use `./dotnet/eng/scripts/New-FilteredSolution.ps1` to generate a filtered solution:
+
+```powershell
+# Generate a filtered solution for net472 and run tests
+$filtered = ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net472
+dotnet test --solution $filtered --no-build -f net472 --ignore-exit-code 8
+
+# Exclude samples and keep only unit test projects
+./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net10.0 -ExcludeSamples -TestProjectNameFilter "*UnitTests*" -OutputPath dotnet/filtered-unit.slnx
+```
+
+```bash
+# Run tests via dotnet test (uses MTP under the hood)
+dotnet test --project ./tests/Microsoft.Agents.AI.UnitTests -f net10.0
+
+# Run tests with code coverage (Cobertura format)
+dotnet test --project ./tests/Microsoft.Agents.AI.UnitTests -f net10.0 --coverage --coverage-output-format cobertura --coverage-settings ./tests/coverage.runsettings
+
+# Run tests directly via dotnet run (MTP native command line)
+dotnet run --project ./tests/Microsoft.Agents.AI.UnitTests -f net10.0
+
+# Show MTP command line help
+dotnet run --project ./tests/Microsoft.Agents.AI.UnitTests -f net10.0 -- -?
+```
@@ -140,12 +140,10 @@
    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
    <PackageVersion Include="Moq" Version="[4.18.4]" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
-    <PackageVersion Include="xretry" Version="1.9.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xRetry.v3" Version="1.0.0-rc3" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
    <!-- Symbols -->
    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
    <!-- Toolset -->
@@ -313,7 +313,6 @@
  </Folder>
  <Folder Name="/Solution Items/.github/workflows/">
    <File Path="../.github/workflows/dotnet-build-and-test.yml" />
-    <File Path="../.github/workflows/dotnet-check-coverage.ps1" />
    <File Path="../.github/workflows/dotnet-format.yml" />
  </Folder>
  <Folder Name="/Solution Items/demos/">
@@ -350,6 +349,10 @@
    <File Path="eng/MSBuild/Shared.props" />
    <File Path="eng/MSBuild/Shared.targets" />
  </Folder>
+  <Folder Name="/Solution Items/eng/scripts/">
+    <File Path="eng/scripts/dotnet-check-coverage.ps1" />
+    <File Path="eng/scripts/New-FilteredSolution.ps1" />
+  </Folder>
  <Folder Name="/Solution Items/nuget/">
    <File Path="nuget/icon.png" />
    <File Path="nuget/nuget-package.props" />
@@ -0,0 +1,145 @@
+#!/usr/bin/env pwsh
+# Copyright (c) Microsoft. All rights reserved.
+
+<#
+.SYNOPSIS
+    Generates a filtered .slnx solution file by removing projects that don't match the specified criteria.
+
+.DESCRIPTION
+    Parses a .slnx solution file and applies one or more filters:
+    - Removes projects that don't support the specified target framework (via MSBuild query).
+    - Optionally removes all sample projects (under samples/).
+    - Optionally filters test projects by name pattern (e.g., only *UnitTests*).
+    Writes the filtered solution to the specified output path and prints the path.
+
+.PARAMETER Solution
+    Path to the source .slnx solution file.
+
+.PARAMETER TargetFramework
+    The target framework to filter by (e.g., net10.0, net472).
+
+.PARAMETER Configuration
+    Optional MSBuild configuration used when querying TargetFrameworks. Defaults to Debug.
+
+.PARAMETER TestProjectNameFilter
+    Optional wildcard pattern to filter test project names (e.g., *UnitTests*, *IntegrationTests*).
+    When specified, only test projects whose filename matches this pattern are kept.
+
+.PARAMETER ExcludeSamples
+    When specified, removes all projects under the samples/ directory from the solution.
+
+.PARAMETER OutputPath
+    Optional output path for the filtered .slnx file. If not specified, a temp file is created.
+
+.EXAMPLE
+    # Generate a filtered solution and run tests
+    $filtered = ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net472
+    dotnet test --solution $filtered --no-build -f net472
+
+.EXAMPLE
+    # Generate a solution with only unit test projects
+    ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net10.0 -TestProjectNameFilter "*UnitTests*" -OutputPath filtered-unit.slnx
+
+.EXAMPLE
+    # Inline usage with dotnet test (PowerShell)
+    dotnet test --solution (./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net472) --no-build -f net472
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [string]$Solution,
+
+    [Parameter(Mandatory)]
+    [string]$TargetFramework,
+
+    [string]$Configuration = "Debug",
+
+    [string]$TestProjectNameFilter,
+
+    [switch]$ExcludeSamples,
+
+    [string]$OutputPath
+)
+
+$ErrorActionPreference = "Stop"
+
+# Resolve the solution path
+$solutionPath = Resolve-Path $Solution
+$solutionDir = Split-Path $solutionPath -Parent
+
+if (-not $OutputPath) {
+    $OutputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), "filtered-$(Split-Path $solutionPath -Leaf)")
+}
+
+# Parse the .slnx XML
+[xml]$slnx = Get-Content $solutionPath -Raw
+
+$removed = @()
+$kept = @()
+
+# Remove sample projects if requested
+if ($ExcludeSamples) {
+    $sampleProjects = $slnx.SelectNodes("//Project[contains(@Path, 'samples/')]")
+    foreach ($proj in $sampleProjects) {
+        $projRelPath = $proj.GetAttribute("Path")
+        Write-Verbose "Removing (sample): $projRelPath"
+        $removed += $projRelPath
+        $proj.ParentNode.RemoveChild($proj) | Out-Null
+    }
+    Write-Host "Removed $($sampleProjects.Count) sample project(s)." -ForegroundColor Yellow
+}
+
+# Filter all remaining projects by target framework
+$allProjects = $slnx.SelectNodes("//Project")
+
+foreach ($proj in $allProjects) {
+    $projRelPath = $proj.GetAttribute("Path")
+    $projFullPath = Join-Path $solutionDir $projRelPath
+    $projFileName = Split-Path $projRelPath -Leaf
+    $isTestProject = $projRelPath -like "*tests/*"
+
+    # Filter test projects by name pattern if specified
+    if ($isTestProject -and $TestProjectNameFilter -and ($projFileName -notlike $TestProjectNameFilter)) {
+        Write-Verbose "Removing (name filter): $projRelPath"
+        $removed += $projRelPath
+        $proj.ParentNode.RemoveChild($proj) | Out-Null
+        continue
+    }
+
+    if (-not (Test-Path $projFullPath)) {
+        Write-Verbose "Project not found, keeping in solution: $projRelPath"
+        $kept += $projRelPath
+        continue
+    }
+
+    # Query the project's target frameworks using MSBuild
+    $targetFrameworks = & dotnet msbuild $projFullPath -getProperty:TargetFrameworks -p:Configuration=$Configuration -nologo 2>$null
+    $targetFrameworks = $targetFrameworks.Trim()
+
+    if ($targetFrameworks -like "*$TargetFramework*") {
+        Write-Verbose "Keeping: $projRelPath (targets: $targetFrameworks)"
+        $kept += $projRelPath
+    }
+    else {
+        Write-Verbose "Removing: $projRelPath (targets: $targetFrameworks, missing: $TargetFramework)"
+        $removed += $projRelPath
+        $proj.ParentNode.RemoveChild($proj) | Out-Null
+    }
+}
+
+# Write the filtered solution
+$slnx.Save($OutputPath)
+
+# Report results to stderr so stdout is clean for piping
+Write-Host "Filtered solution written to: $OutputPath" -ForegroundColor Green
+if ($removed.Count -gt 0) {
+    Write-Host "Removed $($removed.Count) project(s):" -ForegroundColor Yellow
+    foreach ($r in $removed) {
+        Write-Host "  - $r" -ForegroundColor Yellow
+    }
+}
+Write-Host "Kept $($kept.Count) project(s)." -ForegroundColor Green
+
+# Output the path for piping
+Write-Output $OutputPath
@@ -3,5 +3,8 @@
        "version": "10.0.100",
        "rollForward": "minor",
        "allowPrerelease": false
+    },
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
    }
 }
@@ -15,11 +15,15 @@ public abstract class AgentTests<TAgentFixture>(Func<TAgentFixture> createAgentF
 {
    protected TAgentFixture Fixture { get; private set; } = default!;

-    public Task InitializeAsync()
+    public async ValueTask InitializeAsync()
    {
        this.Fixture = createAgentFixture();
-        return this.Fixture.InitializeAsync();
+        await this.Fixture.InitializeAsync();
    }

-    public Task DisposeAsync() => this.Fixture.DisposeAsync();
+    public async ValueTask DisposeAsync()
+    {
+        GC.SuppressFinalize(this);
+        await this.Fixture.DisposeAsync();
+    }
 }
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS8793</NoWarn>
    <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
  </PropertyGroup>

@@ -1,26 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System;
-using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;

 namespace AnthropicChatCompletion.IntegrationTests;

-public abstract class SkipAllChatClientRunStreaming(Func<AnthropicChatCompletionFixture> func) : ChatClientAgentRunStreamingTests<AnthropicChatCompletionFixture>(func)
-{
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithFunctionsInvokesFunctionsAndReturnsExpectedResultsAsync()
-        => base.RunWithFunctionsInvokesFunctionsAndReturnsExpectedResultsAsync();
+public class AnthropicBetaChatCompletionChatClientAgentReasoningRunStreamingTests() : ChatClientAgentRunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: true));

-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithInstructionsAndNoMessageReturnsExpectedResultAsync()
-        => base.RunWithInstructionsAndNoMessageReturnsExpectedResultAsync();
-}
+public class AnthropicBetaChatCompletionChatClientAgentRunStreamingTests() : ChatClientAgentRunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: true));

-public class AnthropicBetaChatCompletionChatClientAgentReasoningRunStreamingTests() : SkipAllChatClientRunStreaming(() => new(useReasoningChatModel: true, useBeta: true));
+public class AnthropicChatCompletionChatClientAgentRunStreamingTests() : ChatClientAgentRunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: false));

-public class AnthropicBetaChatCompletionChatClientAgentRunStreamingTests() : SkipAllChatClientRunStreaming(() => new(useReasoningChatModel: false, useBeta: true));
-
-public class AnthropicChatCompletionChatClientAgentRunStreamingTests() : SkipAllChatClientRunStreaming(() => new(useReasoningChatModel: false, useBeta: false));
-
-public class AnthropicChatCompletionChatClientAgentReasoningRunStreamingTests() : SkipAllChatClientRunStreaming(() => new(useReasoningChatModel: true, useBeta: false));
+public class AnthropicChatCompletionChatClientAgentReasoningRunStreamingTests() : ChatClientAgentRunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: false));
@@ -1,30 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System;
-using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;

 namespace AnthropicChatCompletion.IntegrationTests;

-public abstract class SkipAllChatClientAgentRun(Func<AnthropicChatCompletionFixture> func) : ChatClientAgentRunTests<AnthropicChatCompletionFixture>(func)
-{
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithFunctionsInvokesFunctionsAndReturnsExpectedResultsAsync()
-        => base.RunWithFunctionsInvokesFunctionsAndReturnsExpectedResultsAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithInstructionsAndNoMessageReturnsExpectedResultAsync()
-        => base.RunWithInstructionsAndNoMessageReturnsExpectedResultAsync();
-}
-
 public class AnthropicBetaChatCompletionChatClientAgentRunTests()
-    : SkipAllChatClientAgentRun(() => new(useReasoningChatModel: false, useBeta: true));
+    : ChatClientAgentRunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: true));

 public class AnthropicBetaChatCompletionChatClientAgentReasoningRunTests()
-    : SkipAllChatClientAgentRun(() => new(useReasoningChatModel: true, useBeta: true));
+    : ChatClientAgentRunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: true));

 public class AnthropicChatCompletionChatClientAgentRunTests()
-    : SkipAllChatClientAgentRun(() => new(useReasoningChatModel: false, useBeta: false));
+    : ChatClientAgentRunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: false));

 public class AnthropicChatCompletionChatClientAgentReasoningRunTests()
-    : SkipAllChatClientAgentRun(() => new(useReasoningChatModel: true, useBeta: false));
+    : ChatClientAgentRunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: false));
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -102,9 +103,15 @@ public class AnthropicChatCompletionFixture : IChatClientAgentFixture
        // Chat Completion does not require/support deleting sessions, so this is a no-op.
        Task.CompletedTask;

-    public async Task InitializeAsync() =>
+    public async ValueTask InitializeAsync()
+    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
        this._agent = await this.CreateChatClientAgentAsync();
+    }

-    public Task DisposeAsync() =>
-        Task.CompletedTask;
+    public ValueTask DisposeAsync()
+    {
+        GC.SuppressFinalize(this);
+        return default;
+    }
 }
@@ -1,37 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System;
-using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;

 namespace AnthropicChatCompletion.IntegrationTests;

-public abstract class SkipAllRunStreaming(Func<AnthropicChatCompletionFixture> func) : RunStreamingTests<AnthropicChatCompletionFixture>(func)
-{
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithChatMessageReturnsExpectedResultAsync() => base.RunWithChatMessageReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithNoMessageDoesNotFailAsync() => base.RunWithNoMessageDoesNotFailAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithChatMessagesReturnsExpectedResultAsync() => base.RunWithChatMessagesReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithStringReturnsExpectedResultAsync() => base.RunWithStringReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task SessionMaintainsHistoryAsync() => base.SessionMaintainsHistoryAsync();
-}
-
 public class AnthropicBetaChatCompletionRunStreamingTests()
-    : SkipAllRunStreaming(() => new(useReasoningChatModel: false, useBeta: true));
+    : RunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: true));

 public class AnthropicBetaChatCompletionReasoningRunStreamingTests()
-    : SkipAllRunStreaming(() => new(useReasoningChatModel: true, useBeta: true));
+    : RunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: true));

 public class AnthropicChatCompletionRunStreamingTests()
-    : SkipAllRunStreaming(() => new(useReasoningChatModel: false, useBeta: false));
+    : RunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: false));

 public class AnthropicChatCompletionReasoningRunStreamingTests()
-    : SkipAllRunStreaming(() => new(useReasoningChatModel: true, useBeta: false));
+    : RunStreamingTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: false));
@@ -1,37 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System;
-using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;

 namespace AnthropicChatCompletion.IntegrationTests;

-public abstract class SkipAllRun(Func<AnthropicChatCompletionFixture> func) : RunTests<AnthropicChatCompletionFixture>(func)
-{
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithChatMessageReturnsExpectedResultAsync() => base.RunWithChatMessageReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithNoMessageDoesNotFailAsync() => base.RunWithNoMessageDoesNotFailAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithChatMessagesReturnsExpectedResultAsync() => base.RunWithChatMessagesReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task RunWithStringReturnsExpectedResultAsync() => base.RunWithStringReturnsExpectedResultAsync();
-
-    [Fact(Skip = AnthropicChatCompletionFixture.SkipReason)]
-    public override Task SessionMaintainsHistoryAsync() => base.SessionMaintainsHistoryAsync();
-}
-
 public class AnthropicBetaChatCompletionRunTests()
-    : SkipAllRun(() => new(useReasoningChatModel: false, useBeta: true));
+    : RunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: true));

 public class AnthropicBetaChatCompletionReasoningRunTests()
-    : SkipAllRun(() => new(useReasoningChatModel: true, useBeta: true));
+    : RunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: true));

 public class AnthropicChatCompletionRunTests()
-    : SkipAllRun(() => new(useReasoningChatModel: false, useBeta: false));
+    : RunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: false, useBeta: false));

 public class AnthropicChatCompletionReasoningRunTests()
-    : SkipAllRun(() => new(useReasoningChatModel: true, useBeta: false));
+    : RunTests<AnthropicChatCompletionFixture>(() => new(useReasoningChatModel: true, useBeta: false));
@@ -22,9 +22,11 @@ public sealed class AnthropicSkillsIntegrationTests
    // All tests for Anthropic are intended to be ran locally as the CI pipeline for Anthropic is not setup.
    private const string SkipReason = "Integrations tests for local execution only";

-    [Fact(Skip = SkipReason)]
+    [Fact]
    public async Task CreateAgentWithPptxSkillAsync()
    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
+
        // Arrange
        AnthropicClient anthropicClient = new() { ApiKey = TestConfiguration.GetRequiredValue(TestSettings.AnthropicApiKey) };
        string model = TestConfiguration.GetRequiredValue(TestSettings.AnthropicChatModelName);
@@ -51,9 +53,11 @@ public sealed class AnthropicSkillsIntegrationTests
        Assert.NotEmpty(response.Text);
    }

-    [Fact(Skip = SkipReason)]
+    [Fact]
    public async Task ListAnthropicManagedSkillsAsync()
    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
+
        // Arrange
        AnthropicClient anthropicClient = new() { ApiKey = TestConfiguration.GetRequiredValue(TestSettings.AnthropicApiKey) };

@@ -9,10 +9,10 @@ namespace AzureAI.IntegrationTests;

 public class AIProjectClientAgentRunStreamingPreviousResponseTests() : RunStreamingTests<AIProjectClientFixture>(() => new())
 {
-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithNoMessageDoesNotFailAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithNoMessageDoesNotFailAsync();
    }
 }

@@ -24,9 +24,9 @@ public class AIProjectClientAgentRunStreamingConversationTests() : RunTests<AIPr
        return new ChatClientAgentRunOptions(new() { ConversationId = conversationId });
    };

-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithNoMessageDoesNotFailAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithNoMessageDoesNotFailAsync();
    }
 }
@@ -9,10 +9,10 @@ namespace AzureAI.IntegrationTests;

 public class AIProjectClientAgentRunPreviousResponseTests() : RunTests<AIProjectClientFixture>(() => new())
 {
-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithNoMessageDoesNotFailAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithNoMessageDoesNotFailAsync();
    }
 }

@@ -24,9 +24,9 @@ public class AIProjectClientAgentRunConversationTests() : RunTests<AIProjectClie
        return new ChatClientAgentRunOptions(new() { ConversationId = conversationId });
    };

-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithNoMessageDoesNotFailAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithNoMessageDoesNotFailAsync();
    }
 }
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft. All rights reserved.

-using System;
 using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;
 using AgentConformance.IntegrationTests.Support;
@@ -66,17 +65,23 @@ public class AIProjectClientAgentStructuredOutputRunTests() : StructuredOutputRu
        Assert.Equal("Paris", response.Result.Name);
    }

-    [Fact(Skip = NotSupported)]
-    public override Task RunWithGenericTypeReturnsExpectedResultAsync() =>
-        base.RunWithGenericTypeReturnsExpectedResultAsync();
+    public override Task RunWithGenericTypeReturnsExpectedResultAsync()
+    {
+        Assert.Skip(NotSupported);
+        return base.RunWithGenericTypeReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = NotSupported)]
-    public override Task RunWithResponseFormatReturnsExpectedResultAsync() =>
-        base.RunWithResponseFormatReturnsExpectedResultAsync();
+    public override Task RunWithResponseFormatReturnsExpectedResultAsync()
+    {
+        Assert.Skip(NotSupported);
+        return base.RunWithResponseFormatReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = NotSupported)]
-    public override Task RunWithPrimitiveTypeReturnsExpectedResultAsync() =>
-        base.RunWithPrimitiveTypeReturnsExpectedResultAsync();
+    public override Task RunWithPrimitiveTypeReturnsExpectedResultAsync()
+    {
+        Assert.Skip(NotSupported);
+        return base.RunWithPrimitiveTypeReturnsExpectedResultAsync();
+    }
 }

 /// <summary>
@@ -84,7 +89,7 @@ public class AIProjectClientAgentStructuredOutputRunTests() : StructuredOutputRu
 /// </summary>
 public class AIProjectClientStructuredOutputFixture<T> : AIProjectClientFixture
 {
-    public override Task InitializeAsync()
+    public override async ValueTask InitializeAsync()
    {
        var agentOptions = new ChatClientAgentOptions
        {
@@ -94,6 +99,6 @@ public class AIProjectClientStructuredOutputFixture<T> : AIProjectClientFixture
            },
        };

-        return this.InitializeAsync(agentOptions);
+        await this.InitializeAsync(agentOptions);
    }
 }
@@ -7,9 +7,9 @@ namespace AzureAI.IntegrationTests;

 public class AIProjectClientChatClientAgentRunStreamingTests() : ChatClientAgentRunStreamingTests<AIProjectClientFixture>(() => new())
 {
-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithInstructionsAndNoMessageReturnsExpectedResultAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithInstructionsAndNoMessageReturnsExpectedResultAsync();
    }
 }
@@ -7,9 +7,9 @@ namespace AzureAI.IntegrationTests;

 public class AIProjectClientChatClientAgentRunTests() : ChatClientAgentRunTests<AIProjectClientFixture>(() => new())
 {
-    [Fact(Skip = "No messages is not supported")]
    public override Task RunWithInstructionsAndNoMessageReturnsExpectedResultAsync()
    {
-        return Task.CompletedTask;
+        Assert.Skip("No messages is not supported");
+        return base.RunWithInstructionsAndNoMessageReturnsExpectedResultAsync();
    }
 }
@@ -155,17 +155,19 @@ public class AIProjectClientFixture : IChatClientAgentFixture
        }
    }

-    public Task DisposeAsync()
+    public ValueTask DisposeAsync()
    {
+        GC.SuppressFinalize(this);
+
        if (this._client is not null && this._agent is not null)
        {
-            return this._client.Agents.DeleteAgentAsync(this._agent.Name);
+            return new ValueTask(this._client.Agents.DeleteAgentAsync(this._agent.Name));
        }

-        return Task.CompletedTask;
+        return default;
    }

-    public virtual async Task InitializeAsync()
+    public virtual async ValueTask InitializeAsync()
    {
        this._client = new(new Uri(TestConfiguration.GetRequiredValue(TestSettings.AzureAIProjectEndpoint)), TestAzureCliCredentials.CreateAzureCliCredential());
        this._agent = await this.CreateChatClientAgentAsync();
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS8793</NoWarn>
    <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
    <InjectSharedIntegrationTestAzureCredentialsCode>True</InjectSharedIntegrationTestAzureCredentialsCode>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS8793</NoWarn>
    <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
    <InjectSharedIntegrationTestAzureCredentialsCode>True</InjectSharedIntegrationTestAzureCredentialsCode>
  </PropertyGroup>
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;
@@ -83,17 +84,19 @@ public class AzureAIAgentsPersistentFixture : IChatClientAgentFixture
        return Task.CompletedTask;
    }

-    public Task DisposeAsync()
+    public ValueTask DisposeAsync()
    {
+        GC.SuppressFinalize(this);
+
        if (this._persistentAgentsClient is not null && this._agent is not null)
        {
-            return this._persistentAgentsClient.Administration.DeleteAgentAsync(this._agent.Id);
+            return new ValueTask(this._persistentAgentsClient.Administration.DeleteAgentAsync(this._agent.Id));
        }

-        return Task.CompletedTask;
+        return default;
    }

-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
    {
        this._persistentAgentsClient = new(TestConfiguration.GetRequiredValue(TestSettings.AzureAIProjectEndpoint), TestAzureCliCredentials.CreateAzureCliCredential());
        this._agent = await this.CreateChatClientAgentAsync();
@@ -9,15 +9,21 @@ public class AzureAIAgentsPersistentStructuredOutputRunTests() : StructuredOutpu
 {
    private const string SkipReason = "Fails intermittently on the build agent/CI";

-    [Fact(Skip = SkipReason)]
-    public override Task RunWithResponseFormatReturnsExpectedResultAsync() =>
-        base.RunWithResponseFormatReturnsExpectedResultAsync();
+    public override Task RunWithResponseFormatReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
+        return base.RunWithResponseFormatReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = SkipReason)]
-    public override Task RunWithGenericTypeReturnsExpectedResultAsync() =>
-        base.RunWithGenericTypeReturnsExpectedResultAsync();
+    public override Task RunWithGenericTypeReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
+        return base.RunWithGenericTypeReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = SkipReason)]
-    public override Task RunWithPrimitiveTypeReturnsExpectedResultAsync() =>
-        base.RunWithPrimitiveTypeReturnsExpectedResultAsync();
+    public override Task RunWithPrimitiveTypeReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(SkipReason is not null, SkipReason ?? string.Empty);
+        return base.RunWithPrimitiveTypeReturnsExpectedResultAsync();
+    }
 }
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS8793</NoWarn>
    <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
    <InjectSharedThrow>true</InjectSharedThrow>
  </PropertyGroup>
@@ -28,16 +28,24 @@ public class CopilotStudioFixture : IAgentFixture
        // Chat Completion does not require/support deleting threads, so this is a no-op.
        Task.CompletedTask;

-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
    {
        const string CopilotStudioHttpClientName = nameof(CopilotStudioAgent);

-        var settings = new CopilotStudioConnectionSettings(
-            TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioTenantId),
-            TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioAgentAppId))
+        CopilotStudioConnectionSettings? settings = null;
+        try
        {
-            DirectConnectUrl = TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioDirectConnectUrl),
-        };
+            settings = new CopilotStudioConnectionSettings(
+                TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioTenantId),
+                TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioAgentAppId))
+            {
+                DirectConnectUrl = TestConfiguration.GetRequiredValue(TestSettings.CopilotStudioDirectConnectUrl),
+            };
+        }
+        catch (InvalidOperationException ex)
+        {
+            Assert.Skip("CopilotStudio configuration could not be loaded. Error:" + ex.Message);
+        }

        ServiceCollection services = new();

@@ -56,8 +64,12 @@ public class CopilotStudioFixture : IAgentFixture

        this.Agent = new CopilotStudioAgent(client);

-        return Task.CompletedTask;
+        return default;
    }

-    public Task DisposeAsync() => Task.CompletedTask;
+    public ValueTask DisposeAsync()
+    {
+        GC.SuppressFinalize(this);
+        return default;
+    }
 }
@@ -10,23 +10,33 @@ public class CopilotStudioRunStreamingTests() : RunStreamingTests<CopilotStudioF
    // Set to null to run the tests.
    private const string ManualVerification = "For manual verification";

-    [Fact(Skip = "Copilot Studio does not support session history retrieval, so this test is not applicable.")]
-    public override Task SessionMaintainsHistoryAsync() =>
-        Task.CompletedTask;
+    public override Task SessionMaintainsHistoryAsync()
+    {
+        Assert.Skip("Copilot Studio does not support session history retrieval, so this test is not applicable.");
+        return base.SessionMaintainsHistoryAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithChatMessageReturnsExpectedResultAsync() =>
-        base.RunWithChatMessageReturnsExpectedResultAsync();
+    public override Task RunWithChatMessageReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithChatMessageReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithChatMessagesReturnsExpectedResultAsync() =>
-        base.RunWithChatMessagesReturnsExpectedResultAsync();
+    public override Task RunWithChatMessagesReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithChatMessagesReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithNoMessageDoesNotFailAsync() =>
-        base.RunWithNoMessageDoesNotFailAsync();
+    public override Task RunWithNoMessageDoesNotFailAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithNoMessageDoesNotFailAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithStringReturnsExpectedResultAsync() =>
-        base.RunWithStringReturnsExpectedResultAsync();
+    public override Task RunWithStringReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithStringReturnsExpectedResultAsync();
+    }
 }
@@ -10,23 +10,33 @@ public class CopilotStudioRunTests() : RunTests<CopilotStudioFixture>(() => new(
    // Set to null to run the tests.
    private const string ManualVerification = "For manual verification";

-    [Fact(Skip = "Copilot Studio does not support session history retrieval, so this test is not applicable.")]
-    public override Task SessionMaintainsHistoryAsync() =>
-        Task.CompletedTask;
+    public override Task SessionMaintainsHistoryAsync()
+    {
+        Assert.Skip("Copilot Studio does not support session history retrieval, so this test is not applicable.");
+        return base.SessionMaintainsHistoryAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithChatMessageReturnsExpectedResultAsync() => base.RunWithChatMessageReturnsExpectedResultAsync();
+    public override Task RunWithChatMessageReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithChatMessageReturnsExpectedResultAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithChatMessagesReturnsExpectedResultAsync() =>
+    public override Task RunWithChatMessagesReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithChatMessagesReturnsExpectedResultAsync();
+    }

-        base.RunWithChatMessagesReturnsExpectedResultAsync();
+    public override Task RunWithNoMessageDoesNotFailAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithNoMessageDoesNotFailAsync();
+    }

-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithNoMessageDoesNotFailAsync() =>
-        base.RunWithNoMessageDoesNotFailAsync();
-
-    [Fact(Skip = ManualVerification)]
-    public override Task RunWithStringReturnsExpectedResultAsync() =>
-        base.RunWithStringReturnsExpectedResultAsync();
+    public override Task RunWithStringReturnsExpectedResultAsync()
+    {
+        Assert.SkipWhen(ManualVerification is not null, ManualVerification ?? string.Empty);
+        return base.RunWithStringReturnsExpectedResultAsync();
+    }
 }
@@ -6,22 +6,25 @@
    <IsPackable>false</IsPackable>
    <IsTestProject>true</IsTestProject>
    <IsAotCompatible>false</IsAotCompatible>
+    <OutputType>Exe</OutputType>
    <TargetFrameworks>net10.0;net472</TargetFrameworks>
    <UserSecretsId>b7762d10-e29b-4bb1-8b74-b6d69a667dd4</UserSecretsId>
-    <NoWarn>$(NoWarn);Moq1410;xUnit2023;MAAI001</NoWarn>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <NoWarn>$(NoWarn);Moq1410;xUnit1051;MAAI001</NoWarn>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" />
    <PackageReference Include="Moq" />
-    <PackageReference Include="xRetry" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xRetry.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
    <PackageReference Include="xunit.runner.visualstudio" />
  </ItemGroup>

  <ItemGroup>
-    <Using Include="xRetry" />
+    <Using Include="xRetry.v3" />
    <Using Include="Xunit" />
  </ItemGroup>

@@ -58,7 +58,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
    private bool _preserveContainer;
    private CosmosClient? _setupClient; // Only used for test setup/cleanup

-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
    {
        // Fail fast if emulator is not available
        this.SkipIfEmulatorNotAvailable();
@@ -100,8 +100,10 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        }
    }

-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
    {
+        GC.SuppressFinalize(this);
+
        if (this._setupClient != null && this._emulatorAvailable)
        {
            try
@@ -143,12 +145,12 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        // Locally: Skip if emulator connection check failed
        var ciEmulatorAvailable = string.Equals(Environment.GetEnvironmentVariable("COSMOSDB_EMULATOR_AVAILABLE"), bool.TrueString, StringComparison.OrdinalIgnoreCase);

-        Xunit.Skip.If(!ciEmulatorAvailable && !this._emulatorAvailable, "Cosmos DB Emulator is not available");
+        Assert.SkipWhen(!ciEmulatorAvailable && !this._emulatorAvailable, "Cosmos DB Emulator is not available");
    }

    #region Constructor Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void StateKeys_ReturnsDefaultKey_WhenNoStateKeyProvided()
    {
@@ -163,7 +165,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Contains("CosmosChatHistoryProvider", provider.StateKeys);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void StateKeys_ReturnsCustomKey_WhenSetViaConstructor()
    {
@@ -179,7 +181,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Contains("custom-key", provider.StateKeys);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithConnectionString_ShouldCreateInstance()
    {
@@ -196,7 +198,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(TestContainerId, provider.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithNullConnectionString_ShouldThrowArgumentException()
    {
@@ -206,7 +208,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
                _ => new CosmosChatHistoryProvider.State("test-conversation")));
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithNullStateInitializer_ShouldThrowArgumentNullException()
    {
@@ -221,7 +223,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region InvokedAsync Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_WithSingleMessage_ShouldAddMessageAsync()
    {
@@ -286,7 +288,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(ChatRole.User, messageList[0].Role);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_WithMultipleMessages_ShouldAddAllMessagesAsync()
    {
@@ -329,7 +331,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region InvokingAsync Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokingAsync_WithNoMessages_ShouldReturnEmptyAsync()
    {
@@ -347,7 +349,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Empty(messages);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokingAsync_WithConversationIsolation_ShouldOnlyReturnMessagesForConversationAsync()
    {
@@ -391,7 +393,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region Integration Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task FullWorkflow_AddAndGet_ShouldWorkCorrectlyAsync()
    {
@@ -442,7 +444,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region Disposal Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Dispose_AfterUse_ShouldNotThrow()
    {
@@ -455,7 +457,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        provider.Dispose(); // Should not throw
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Dispose_MultipleCalls_ShouldNotThrow()
    {
@@ -473,7 +475,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region Hierarchical Partitioning Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithHierarchicalConnectionString_ShouldCreateInstance()
    {
@@ -490,7 +492,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(HierarchicalTestContainerId, provider.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithHierarchicalEndpoint_ShouldCreateInstance()
    {
@@ -508,7 +510,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(HierarchicalTestContainerId, provider.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void Constructor_WithHierarchicalCosmosClient_ShouldCreateInstance()
    {
@@ -525,7 +527,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(HierarchicalTestContainerId, provider.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void State_WithEmptyConversationId_ShouldThrowArgumentException()
    {
@@ -534,7 +536,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
            new CosmosChatHistoryProvider.State(""));
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public void State_WithWhitespaceConversationId_ShouldThrowArgumentException()
    {
@@ -543,7 +545,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
            new CosmosChatHistoryProvider.State("   "));
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_WithHierarchicalPartitioning_ShouldAddMessageWithMetadataAsync()
    {
@@ -597,7 +599,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(SessionId, (string)document!.sessionId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_WithHierarchicalMultipleMessages_ShouldAddAllMessagesAsync()
    {
@@ -636,7 +638,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Third hierarchical message", messageList[2].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokingAsync_WithHierarchicalPartitionIsolation_ShouldIsolateMessagesByUserIdAsync()
    {
@@ -682,7 +684,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Message from user 2", messageList2[0].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task StateBag_WithHierarchicalPartitioning_ShouldPreserveStateAcrossProviderInstancesAsync()
    {
@@ -717,7 +719,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(HierarchicalTestContainerId, newStore.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task HierarchicalAndSimplePartitioning_ShouldCoexistAsync()
    {
@@ -759,7 +761,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Hierarchical partitioning message", hierarchicalMessageList[0].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task MaxMessagesToRetrieve_ShouldLimitAndReturnMostRecentAsync()
    {
@@ -800,7 +802,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Message 10", messageList[4].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task MaxMessagesToRetrieve_Null_ShouldReturnAllMessagesAsync()
    {
@@ -836,7 +838,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Message 10", messageList[9].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task GetMessageCountAsync_WithMessages_ShouldReturnCorrectCountAsync()
    {
@@ -868,7 +870,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(5, count);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task GetMessageCountAsync_WithNoMessages_ShouldReturnZeroAsync()
    {
@@ -887,7 +889,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal(0, count);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task ClearMessagesAsync_WithMessages_ShouldDeleteAndReturnCountAsync()
    {
@@ -935,7 +937,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Empty(retrievedMessages);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task ClearMessagesAsync_WithNoMessages_ShouldReturnZeroAsync()
    {
@@ -958,7 +960,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable

    #region Message Filter Tests

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_DefaultFilter_ExcludesChatHistoryMessagesFromStorageAsync()
    {
@@ -993,7 +995,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Response", messages[2].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokedAsync_CustomStorageInputFilter_OverridesDefaultAsync()
    {
@@ -1031,7 +1033,7 @@ public sealed class CosmosChatHistoryProviderTests : IAsyncLifetime, IDisposable
        Assert.Equal("Response", messages[1].Text);
    }

-    [SkippableFact]
+    [Fact]
    [Trait("Category", "CosmosDB")]
    public async Task InvokingAsync_RetrievalOutputFilter_FiltersRetrievedMessagesAsync()
    {
@@ -55,7 +55,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        return options;
    }

-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
    {
        // Fail fast if emulator is not available
        this.SkipIfEmulatorNotAvailable();
@@ -88,8 +88,10 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        }
    }

-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
    {
+        GC.SuppressFinalize(this);
+
        if (this._cosmosClient != null && this._emulatorAvailable)
        {
            try
@@ -124,12 +126,12 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        // Locally: Skip if emulator connection check failed
        var ciEmulatorAvailable = string.Equals(Environment.GetEnvironmentVariable("COSMOSDB_EMULATOR_AVAILABLE"), bool.TrueString, StringComparison.OrdinalIgnoreCase);

-        Xunit.Skip.If(!ciEmulatorAvailable && !this._emulatorAvailable, "Cosmos DB Emulator is not available");
+        Assert.SkipWhen(!ciEmulatorAvailable && !this._emulatorAvailable, "Cosmos DB Emulator is not available");
    }

    #region Constructor Tests

-    [SkippableFact]
+    [Fact]
    public void Constructor_WithCosmosClient_SetsProperties()
    {
        // Arrange
@@ -143,7 +145,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Equal(TestContainerId, store.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    public void Constructor_WithConnectionString_SetsProperties()
    {
        // Arrange
@@ -157,7 +159,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Equal(TestContainerId, store.ContainerId);
    }

-    [SkippableFact]
+    [Fact]
    public void Constructor_WithNullCosmosClient_ThrowsArgumentNullException()
    {
        // Act & Assert
@@ -165,7 +167,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
            new CosmosCheckpointStore((CosmosClient)null!, s_testDatabaseId, TestContainerId));
    }

-    [SkippableFact]
+    [Fact]
    public void Constructor_WithNullConnectionString_ThrowsArgumentException()
    {
        // Act & Assert
@@ -177,7 +179,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable

    #region Checkpoint Operations Tests

-    [SkippableFact]
+    [Fact]
    public async Task CreateCheckpointAsync_NewCheckpoint_CreatesSuccessfullyAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -197,7 +199,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.NotEmpty(checkpointInfo.CheckpointId);
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveCheckpointAsync_ExistingCheckpoint_ReturnsCorrectValueAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -218,7 +220,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Equal("Hello, World!", messageProp.GetString());
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveCheckpointAsync_NonExistentCheckpoint_ThrowsInvalidOperationExceptionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -233,7 +235,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
            store.RetrieveCheckpointAsync(sessionId, fakeCheckpointInfo).AsTask());
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveIndexAsync_EmptyStore_ReturnsEmptyCollectionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -250,7 +252,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Empty(index);
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveIndexAsync_WithCheckpoints_ReturnsAllCheckpointsAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -275,7 +277,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Contains(index, c => c.CheckpointId == checkpoint3.CheckpointId);
    }

-    [SkippableFact]
+    [Fact]
    public async Task CreateCheckpointAsync_WithParent_CreatesHierarchyAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -295,7 +297,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
        Assert.Equal(sessionId, childCheckpoint.SessionId);
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveIndexAsync_WithParentFilter_ReturnsFilteredResultsAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -331,7 +333,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable

    #region Run Isolation Tests

-    [SkippableFact]
+    [Fact]
    public async Task CheckpointOperations_DifferentRuns_IsolatesDataAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -361,7 +363,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable

    #region Error Handling Tests

-    [SkippableFact]
+    [Fact]
    public async Task CreateCheckpointAsync_WithNullSessionId_ThrowsArgumentExceptionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -375,7 +377,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
            store.CreateCheckpointAsync(null!, checkpointValue).AsTask());
    }

-    [SkippableFact]
+    [Fact]
    public async Task CreateCheckpointAsync_WithEmptySessionId_ThrowsArgumentExceptionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -389,7 +391,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
            store.CreateCheckpointAsync("", checkpointValue).AsTask());
    }

-    [SkippableFact]
+    [Fact]
    public async Task RetrieveCheckpointAsync_WithNullCheckpointInfo_ThrowsArgumentNullExceptionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -407,7 +409,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable

    #region Disposal Tests

-    [SkippableFact]
+    [Fact]
    public async Task Dispose_AfterDisposal_ThrowsObjectDisposedExceptionAsync()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -424,7 +426,7 @@ public class CosmosCheckpointStoreTests : IAsyncLifetime, IDisposable
            store.CreateCheckpointAsync("test-run", checkpointValue).AsTask());
    }

-    [SkippableFact]
+    [Fact]
    public void Dispose_MultipleCalls_DoesNotThrow()
    {
        this.SkipIfEmulatorNotAvailable();
@@ -17,7 +17,6 @@
    <PackageReference Include="System.Linq.AsyncEnumerable" />
    <PackageReference Include="Azure.Identity" />
    <PackageReference Include="Microsoft.Azure.Cosmos" />
-    <PackageReference Include="Xunit.SkippableFact" />
  </ItemGroup>

 </Project>
@@ -9,7 +9,6 @@ using Microsoft.DurableTask.Client.Entities;
 using Microsoft.DurableTask.Entities;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Chat;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -6,7 +6,6 @@ using System.Reflection;
 using System.Text;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -30,7 +29,7 @@ public sealed class ConsoleAppSamplesValidation(ITestOutputHelper outputHelper)

    private readonly ITestOutputHelper _outputHelper = outputHelper;

-    async Task IAsyncLifetime.InitializeAsync()
+    async ValueTask IAsyncLifetime.InitializeAsync()
    {
        if (!s_infrastructureStarted)
        {
@@ -39,7 +38,7 @@ public sealed class ConsoleAppSamplesValidation(ITestOutputHelper outputHelper)
        }
    }

-    async Task IAsyncLifetime.DisposeAsync()
+    async ValueTask IAsyncDisposable.DisposeAsync()
    {
        // Nothing to clean up
        await Task.CompletedTask;
@@ -736,6 +735,9 @@ public sealed class ConsoleAppSamplesValidation(ITestOutputHelper outputHelper)

    private async Task RunSampleTestAsync(string samplePath, Func<Process, BlockingCollection<OutputLog>, Task> testAction)
    {
+        // Build the sample project first (it may not have been built as part of the solution)
+        await this.BuildSampleAsync(samplePath);
+
        // Generate a unique TaskHub name for this sample test to prevent cross-test interference
        // when multiple tests run together and share the same DTS emulator.
        string uniqueTaskHubName = $"sample-{Guid.NewGuid().ToString("N").Substring(0, 6)}";
@@ -814,12 +816,44 @@ public sealed class ConsoleAppSamplesValidation(ITestOutputHelper outputHelper)
        return null;
    }

+    private async Task BuildSampleAsync(string samplePath)
+    {
+        this._outputHelper.WriteLine($"Building sample at {samplePath}...");
+
+        ProcessStartInfo buildInfo = new()
+        {
+            FileName = "dotnet",
+            Arguments = $"build --framework {s_dotnetTargetFramework}",
+            WorkingDirectory = samplePath,
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+        };
+
+        using Process buildProcess = new() { StartInfo = buildInfo };
+        buildProcess.Start();
+
+        // Read both streams asynchronously to avoid deadlocks from filled pipe buffers
+        Task<string> stdoutTask = buildProcess.StandardOutput.ReadToEndAsync();
+        Task<string> stderrTask = buildProcess.StandardError.ReadToEndAsync();
+        await buildProcess.WaitForExitAsync();
+
+        string stderr = await stderrTask;
+        if (buildProcess.ExitCode != 0)
+        {
+            string stdout = await stdoutTask;
+            throw new InvalidOperationException($"Failed to build sample at {samplePath}:\n{stdout}\n{stderr}");
+        }
+
+        this._outputHelper.WriteLine($"Build completed for {samplePath}.");
+    }
+
    private Process StartConsoleApp(string samplePath, BlockingCollection<OutputLog> logs, string taskHubName)
    {
        ProcessStartInfo startInfo = new()
        {
            FileName = "dotnet",
-            Arguments = $"run --framework {s_dotnetTargetFramework}",
+            Arguments = $"run --no-build --framework {s_dotnetTargetFramework}",
            WorkingDirectory = samplePath,
            UseShellExecute = false,
            RedirectStandardOutput = true,
@@ -9,7 +9,6 @@ using Microsoft.DurableTask.Client;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Chat;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -2,7 +2,6 @@

 using System.Collections.Concurrent;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests.Logging;

@@ -2,7 +2,6 @@

 using System.Collections.Concurrent;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests.Logging;

@@ -7,7 +7,6 @@ using Microsoft.DurableTask.Client;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Chat;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -14,7 +14,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using OpenAI.Chat;
 using Shared.IntegrationTests;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -7,7 +7,6 @@ using Microsoft.DurableTask.Client;
 using Microsoft.DurableTask.Client.Entities;
 using Microsoft.Extensions.Configuration;
 using OpenAI.Chat;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;

@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests;

@@ -8,7 +8,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests;

@@ -36,7 +35,7 @@ public sealed class SamplesValidation(ITestOutputHelper outputHelper) : IAsyncLi

    private readonly ITestOutputHelper _outputHelper = outputHelper;

-    async Task IAsyncLifetime.InitializeAsync()
+    async ValueTask IAsyncLifetime.InitializeAsync()
    {
        if (!s_infrastructureStarted)
        {
@@ -45,7 +44,7 @@ public sealed class SamplesValidation(ITestOutputHelper outputHelper) : IAsyncLi
        }
    }

-    async Task IAsyncLifetime.DisposeAsync()
+    async ValueTask IAsyncDisposable.DisposeAsync()
    {
        // Nothing to clean up
        await Task.CompletedTask;
@@ -793,6 +792,9 @@ public sealed class SamplesValidation(ITestOutputHelper outputHelper) : IAsyncLi

    private async Task RunSampleTestAsync(string samplePath, Func<IReadOnlyList<OutputLog>, Task> testAction)
    {
+        // Build the sample project first (it may not have been built as part of the solution)
+        await this.BuildSampleAsync(samplePath);
+
        // Start the Azure Functions app
        List<OutputLog> logsContainer = [];
        using Process funcProcess = this.StartFunctionApp(samplePath, logsContainer);
@@ -812,12 +814,44 @@ public sealed class SamplesValidation(ITestOutputHelper outputHelper) : IAsyncLi

    private sealed record OutputLog(DateTime Timestamp, LogLevel Level, string Message);

+    private async Task BuildSampleAsync(string samplePath)
+    {
+        this._outputHelper.WriteLine($"Building sample at {samplePath}...");
+
+        ProcessStartInfo buildInfo = new()
+        {
+            FileName = "dotnet",
+            Arguments = $"build -f {s_dotnetTargetFramework}",
+            WorkingDirectory = samplePath,
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+        };
+
+        using Process buildProcess = new() { StartInfo = buildInfo };
+        buildProcess.Start();
+
+        // Read both streams asynchronously to avoid deadlocks from filled pipe buffers
+        Task<string> stdoutTask = buildProcess.StandardOutput.ReadToEndAsync();
+        Task<string> stderrTask = buildProcess.StandardError.ReadToEndAsync();
+        await buildProcess.WaitForExitAsync();
+
+        string stderr = await stderrTask;
+        if (buildProcess.ExitCode != 0)
+        {
+            string stdout = await stdoutTask;
+            throw new InvalidOperationException($"Failed to build sample at {samplePath}:\n{stdout}\n{stderr}");
+        }
+
+        this._outputHelper.WriteLine($"Build completed for {samplePath}.");
+    }
+
    private Process StartFunctionApp(string samplePath, List<OutputLog> logs)
    {
        ProcessStartInfo startInfo = new()
        {
            FileName = "dotnet",
-            Arguments = $"run -f {s_dotnetTargetFramework} --port {AzureFunctionsPort}",
+            Arguments = $"run --no-build -f {s_dotnetTargetFramework} --port {AzureFunctionsPort}",
            WorkingDirectory = samplePath,
            UseShellExecute = false,
            RedirectStandardOutput = true,
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
 using Microsoft.Extensions.AI;
 using Shared.IntegrationTests;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -9,7 +9,6 @@ using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
 using Shared.IntegrationTests;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;

@@ -8,7 +8,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;
 using Xunit.Sdk;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
@@ -11,7 +11,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Agents;
 using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -12,7 +12,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.Mcp;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -9,7 +9,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.Framework;
 using Microsoft.Extensions.AI;
 using OpenAI.Files;
 using Shared.IntegrationTests;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests;

@@ -5,7 +5,6 @@ using System.Collections.Immutable;
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -5,7 +5,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -4,7 +4,6 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Shared.Code;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -4,7 +4,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -2,7 +2,6 @@

 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -4,7 +4,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -4,7 +4,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -3,7 +3,6 @@
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.CodeGen;

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

 using System;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests;

@@ -12,7 +12,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Moq;
-using Xunit.Abstractions;
 using Xunit.Sdk;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests;
@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.Entities;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.Entities;

@@ -4,7 +4,6 @@ using System;
 using Microsoft.Agents.AI.Workflows.Declarative.Entities;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.Entities;

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text.Json;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.Events;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.Events;

@@ -2,7 +2,6 @@

 using Microsoft.Agents.AI.Workflows.Declarative.Events;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.Events;

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.Interpreter;

@@ -9,7 +9,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -9,7 +9,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -6,7 +6,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -6,7 +6,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -10,7 +10,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Moq;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -12,7 +12,6 @@ using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
 using Moq;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -12,7 +12,6 @@ using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
 using Moq;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -6,7 +6,6 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.ObjectModel;
-using Xunit.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.UnitTests.ObjectModel;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
westeyandGitHub	0e13d182e0	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-05 12:23:01 +00:00
westeyandGitHub	158e418f7c	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-05 11:33:00 +00:00
westeyandGitHub	410b68e421	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-04 19:09:22 +00:00
westeyandGitHub	9203cbe42b	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-04 17:40:24 +00:00
westeyandGitHub	5441fec79f	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-04 15:30:47 +00:00
westeyandGitHub	e730fc1c2e	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-04 14:28:24 +00:00
westeyandGitHub	213fcb9011	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-03 17:41:47 +00:00
westeyandGitHub	21e7873a53	.NET: Disable flakey Workflow Observability tests (#4416 ) * Disable flakey OffThread test * Disable additional OffThread test * Disable a further test * Disable all observability tests	2026-03-03 15:40:00 +00:00
westeyandGitHub	5dcf45b7b2	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-03-03 11:54:29 +00:00
westeyandGitHub	7cb4e7864a	Revert parallel disable (#4324 )	2026-02-26 14:33:25 +00:00
westeyandGitHub	279386dbed	Disable Parallelization for WorkflowRunActivityStopTests (#4313 )	2026-02-26 12:02:24 +00:00
westeyandGitHub	6bc5f54341	Fix encoding (#4309 )	2026-02-26 11:06:28 +00:00
westeyandGitHub	204d01c329	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-02-26 10:52:50 +00:00
+6 westey GitHub alliscode Copilot crickmancopilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>Copilot Roger Barreto Eduard van Valkenburg Rishabh Chawla Peter Ibekwe Dmytro Struk Ben Thomas Evan Mattson	8b191de936	Merge and move scripts (#4308 ) * .NET: Add Microsoft Fabric sample #3674 (#4230) Co-authored-by: Chris <66376200+crickman@users.noreply.github.com> * Python: Phase 2: Embedding clients for Ollama, Bedrock, and Azure AI Inference (#4207) * Phase 2: Embedding clients for Ollama, Bedrock, and Azure AI Inference Add embedding client implementations to existing provider packages: - OllamaEmbeddingClient: Text embeddings via Ollama's embed API - BedrockEmbeddingClient: Text embeddings via Amazon Titan on Bedrock - AzureAIInferenceEmbeddingClient: Text and image embeddings via Azure AI Inference, supporting Content \| str input with separate model IDs for text (AZURE_AI_INFERENCE_EMBEDDING_MODEL_ID) and image (AZURE_AI_INFERENCE_IMAGE_EMBEDDING_MODEL_ID) endpoints Additional changes: - Rename EmbeddingCoT -> EmbeddingT, EmbeddingOptionsCoT -> EmbeddingOptionsT - Add otel_provider_name passthrough to all embedding clients - Register integration pytest marker in all packages - Add lazy-loading namespace exports for Ollama and Bedrock embeddings - Add image embedding sample using Cohere-embed-v3-english - Add azure-ai-inference dependency to azure-ai package Part of #1188 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix mypy duplicate name and ruff lint issues - Rename second 'vector' variable to 'img_vector' in image embedding loop - Combine nested with statements in tests - Remove unused result assignments in tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * updates from feedback * Fix CI failures in embedding usage handling - Fix Azure AI embedding mypy issues by normalizing vectors to list[float], safely accumulating optional usage token fields, and filtering None entries before constructing GeneratedEmbeddings - Avoid Bandit false positive by initializing usage details as an empty dict - Update OpenAI embedding tests to assert canonical usage keys (input_token_count/total_token_count) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [Purview] Mark responses as responses and fix epoch bug for python long overflow (#4225) * .NET: Support InvokeMcpTool for declarative workflows (#4204) * Initial implementation of InvokeMcpTool in declarative workflow * Cleaned up sample implementation * Updated sample comments. * Added missing executor routing attribute * Fix PR comments. * Updated based on PR comments. * Updated based on PR comments. * Removed unnecessary using statement. * Update Python package versions to rc2 (#4258) - Bump core and azure-ai to 1.0.0rc2 - Bump preview packages to 1.0.0b260225 - Update dependencies to >=1.0.0rc2 - Add CHANGELOG entries for changes since rc1 - Update uv.lock Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * .NET: Fixing issue where OpenTelemetry span is never exported in .NET in-process workflow execution (#4196) * 1. Add reproduction test for issue #4155: workflow.run Activity never stopped in streaming OffThread path The WorkflowRunActivity_IsStopped_Streaming_OffThread test demonstrates that the workflow.run OpenTelemetry Activity created in StreamingRunEventStream.RunLoopAsync is started but never stopped when using the OffThread/Default streaming execution. The background run loop keeps running after event consumption completes, so the using Activity? declaration never disposes until explicit StopAsync() is called. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> 2. Fix workflow.run Activity never stopped in streaming OffThread execution (#4155) The workflow.run OpenTelemetry Activity in StreamingRunEventStream.RunLoopAsync was scoped to the method lifetime via 'using'. Since the run loop only exits on cancellation, the Activity was never stopped/exported until explicit disposal. Fix: Remove 'using' and explicitly dispose the Activity when the workflow reaches Idle status (all supersteps complete). A safety-net disposal in the finally block handles cancellation and error paths. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add root-level workflow.session activity spanning run loop lifetime\n\nImplements two-level telemetry hierarchy per PR feedback from lokitoth:\n- workflow.session: spans the entire run loop / stream lifetime\n- workflow_invoke: per input-to-halt cycle, nested within the session\n\nThis ensures the session activity stays open across multiple turns,\nwhile individual run activities are created and disposed per cycle.\n\nAlso fixes linkedSource CancellationTokenSource disposal leak in\nStreamingRunEventStream (added using declaration)." * Address Copilot review: fix Activity/CTS disposal, rename activity, add error tag\n\n1. LockstepRunEventStream: Remove 'using' from Activity in async iterator\n and manually dispose in finally block (fixes #4155 pattern). Also dispose\n linkedSource CTS in finally to prevent leak.\n2. Tags.cs: Add ErrorMessage (\"error.message\") tag for runtime errors,\n distinct from BuildErrorMessage (\"build.error.message\").\n3. ActivityNames: Rename WorkflowRun from \"workflow_invoke\" to \"workflow.run\"\n for cross-language consistency.\n4. WorkflowTelemetryContext: Fix XML doc to say \"outer/parent span\" instead\n of \"root-level span\".\n5. ObservabilityTests: Assert WorkflowSession absence when DisableWorkflowRun\n is true.\n6. WorkflowRunActivityStopTests: Fix streaming test race by disposing\n StreamingRun before asserting activities are stopped.\n7. StreamingRunEventStream/LockstepRunEventStream: Use Tags.ErrorMessage\n instead of Tags.BuildErrorMessage for runtime error events." * Review fixes: revert workflow_invoke rename, use 'using' for linkedSource, move SessionStarted earlier\n\n- Revert ActivityNames.WorkflowRun back to \"workflow_invoke\" (OTEL semantic convention contract)\n- Use 'using' declaration for linkedSource CTS in LockstepRunEventStream (no timing sensitivity)\n- Move SessionStarted event before WaitForInputAsync in StreamingRunEventStream to match Lockstep behavior" * Improve naming and comments in WorkflowRunActivityStopTests" * Prevent session Activity.Current leak in lockstep mode, add nesting test Save and restore Activity.Current in LockstepRunEventStream.Start() so the session activity doesn't leak into caller code via AsyncLocal. Re-establish Activity.Current = sessionActivity before creating the run activity in TakeEventStreamAsync to preserve parent-child nesting. Add test verifying app activities after RunAsync are not parented under the session, and that the workflow_invoke activity nests under the session." * Fix stale XML doc: WorkflowRun -> WorkflowInvoke in ObservabilityTests --------- Co-authored-by: alliscode <bentho@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python / .NET Samples - Restructure and Improve Samples (Feature Branc… (#4092) * Python: .NET Samples - Restructure and Improve Samples (Feature Branch) (#4091) * Moved by agent (#4094) * Fix readme links * .NET Samples - Create `04-hosting` learning path step (#4098) * Agent move * Agent reorderd * Remove A2A section from README Removed A2A section from the Getting Started README. * Agent fixed links * Fix broken sample links in durable-agents README (#4101) * Initial plan * Fix broken internal links in documentation Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Revert template link changes; keep only durable-agents README fix Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `03-workflows` learning path step (#4102) * Fix solution project path * Python: Fix broken markdown links to repo resources (outside /docs) (#4105) * Initial plan * Fix broken markdown links to repo resources Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update README to rename .NET Workflows Samples section --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `02-agents` learning path step (#4107) * .NET: Fix broken relative link in GroupChatToolApproval README (#4108) * Initial plan * Fix broken link in GroupChatToolApproval README Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update labeler configuration for workflow samples * .NET - Reorder Agents samples to start from Step01 instead of Step04 (#4110) * Fix solution * Resolve new sample paths * Move new AgentSkills and AgentWithMemory_Step04 samples * Fix link * Fix readme path * fix: update stale dotnet/samples/Durable path reference in AGENTS.md Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Moved new sample * Update solution * Resolve merge (new sample) * Sync to new sample - FoundryAgents_Step21_BingCustomSearch * Updated README * .NET Samples - Configuration Naming Update (#4149) * .NET: Restore AzureFunctions index parity with ConsoleApps under DurableAgents samples (#4221) * Clean-up `05_host_your_agent` * Config setting consistency * Refine samples * AGENTS.md * Move new samples * Re-order samples * Move new project and fixup solution * Fixup model config * Fix up new UT project --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> * Python: Fix Bedrock embedding test stub missing meta attribute (#4287) * Fix Bedrock embedding test stub missing meta attribute * Increase test coverage so gate passes * Python: (ag-ui): fix approval payloads being re-processed on subsequent conversation turns (#4232) * Fix ag-ui tool call issue * Safe json fix * Python: Update workflow orchestration samples to use AzureOpenAIResponsesClient (#4285) * Update workflow orchestration samples to use AzureOpenAIResponsesClient * Fix broken link * Move scripts to scripts folder --------- Co-authored-by: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com> Co-authored-by: Chris <66376200+crickman@users.noreply.github.com> Co-authored-by: Eduard van Valkenburg <eavanvalkenburg@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rishabh Chawla <rishabhchawla1995@gmail.com> Co-authored-by: Peter Ibekwe <109177538+peibekwe@users.noreply.github.com> Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Co-authored-by: Ben Thomas <ben.thomas@microsoft.com> Co-authored-by: alliscode <bentho@microsoft.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Evan Mattson <35585003+moonbox3@users.noreply.github.com>	2026-02-26 10:49:07 +00:00
westeyandGitHub	cc1ef730e3	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-02-25 17:25:52 +00:00
westeyandGitHub	d4f95798c2	Address PR comments (#4255 )	2026-02-25 14:54:27 +00:00
westeyandGitHub	17f75c325e	Separate build from run for console sample validation (#4251 )	2026-02-25 13:49:59 +00:00
westeyandGitHub	9c9168f6a8	Merge branch 'main' into feature-xunit3-mtp-upgrade	2026-02-25 13:31:08 +00:00
westeyandGitHub	ce0b374c27	Pre-build samples via tests to avoid timeouts (#4245 )	2026-02-25 12:20:34 +00:00
westeyandGitHub	ce9f2cdbb1	Filter src by framework for tests build (#4244 ) * Separate build and test into parallel jobs * Filter source projects by framework for tests build	2026-02-25 11:52:43 +00:00
westeyandGitHub	9059721788	Separate build and test into parallel jobs (#4243 )	2026-02-25 11:32:07 +00:00
westeyandGitHub	0ee09d37a8	Increase integration tests threads to 4x (#4242 )	2026-02-25 11:14:55 +00:00
westeyandGitHub	059398c80d	Increase Integration Test Parallelism (#4241 )	2026-02-25 10:21:15 +00:00
westeyandGitHub	b8a59129de	Add project name filter to solution (#4231 )	2026-02-24 22:35:29 +00:00
westeyandGitHub	9e3d6575ee	Fix coverage settings path and trait filter (#4229 )	2026-02-24 22:10:21 +00:00
westeyandGitHub	f1585b1880	Fix build paths (#4228 )	2026-02-24 21:45:53 +00:00
westeyandGitHub	a39e324a43	Add solution filtered parallel test run (#4226 )	2026-02-24 21:21:33 +00:00
westeyandGitHub	be5ed93b99	Remove accidental add of code coverage for integration tests (#4219 )	2026-02-24 17:48:48 +00:00
westeyandGitHub	fb732311ac	Fix anthropic integration tests and skip reason (#4211 )	2026-02-24 14:48:12 +00:00
westeyandGitHub	d04228da39	Fix copilot studio integration tests failure (#4209 )	2026-02-24 12:07:17 +00:00
westeyandGitHub	6c3b9d43ed	.NET: Upgrade to XUnit 3 and Microsoft Testing Platform (#4176 )	2026-02-24 11:26:12 +00:00