Flow main to feature/watch-prototype

.config/dotnet-tools.json

@@ -13,6 +13,12 @@
       "commands": [
         "pwsh"
       ]
+    },
+    "hex1b.tool": {
+      "version": "0.78.0",
+      "commands": [
+        "hex1b"
+      ]
     }
   }
 }

.devcontainer/Dockerfile

@@ -1,7 +1,6 @@
 FROM mcr.microsoft.com/devcontainers/dotnet:10.0-noble
 
 # Workaround for expired Yarn GPG key (https://github.com/yarnpkg/yarn/issues/9218)
-# This updates the yarn keyring before apt-get update is called by devcontainer features
 RUN rm -f /etc/apt/sources.list.d/yarn.list 2>/dev/null || true \
     && rm -f /usr/share/keyrings/yarn-archive-keyring.gpg 2>/dev/null || true \
     && rm -f /usr/share/keyrings/yarn.gpg 2>/dev/null || true

.gitattributes

@@ -60,3 +60,5 @@
 # https://github.com/github/linguist/issues/1626#issuecomment-401442069
 # this only affects the repo's language statistics
 *.h linguist-language=C
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/actions/check-changed-files/action.yml

@@ -1,12 +1,19 @@
 name: 'Check Changed Files'
 description: |
-  Check if all changed files in a PR match provided regex patterns.
+  Check if all changed files in a PR match provided glob patterns.
 
-  This action compares changed files in a pull request against one or more regex patterns
+  This action compares changed files in a pull request against one or more glob patterns
   and determines if all changed files match at least one of the provided patterns.
+  It only supports pull_request events.
 
   Inputs:
-  - patterns: List of regex patterns (multiline string) to match against changed file paths
+  - patterns_file: Path to a file containing glob patterns (relative to repository root).
+                   Lines starting with '#' and blank lines are ignored.
+
+  Pattern syntax:
+  - **  matches any path including directory separators (recursive)
+  - *   matches any characters except a directory separator
+  - .   is treated as a literal dot (no escaping needed)
 
   Outputs:
   - only_changed: Boolean indicating if all changed files matched the patterns
@@ -15,8 +22,8 @@ description: |
   - matched_files: JSON array of files that matched at least one pattern
   - unmatched_files: JSON array of files that didn't match any pattern
 inputs:
-  patterns:
-    description: 'List of regex patterns to match against changed files'
+  patterns_file:
+    description: 'Path to a file containing glob patterns (relative to repository root)'
     required: true
 
 outputs:
@@ -57,12 +64,60 @@ runs:
           exit 1
         fi
 
-        # Read patterns from input (multiline string)
-        PATTERNS_INPUT="${{ inputs.patterns }}"
+        # Convert a glob pattern to an anchored ERE regex pattern.
+        # Glob syntax supported:
+        #   **   matches any path including directory separators
+        #   *    matches any characters except a directory separator
+        #   .    is treated as a literal dot
+        #   All other characters are treated as literals.
+        glob_to_regex() {
+          local glob="$1"
+          local result="$glob"
+          # Replace ** and * with placeholders before escaping
+          result="${result//\*\*/__DOUBLESTAR__}"
+          result="${result//\*/__STAR__}"
+          # Escape regex metacharacters that could appear in file paths.
+          # Note: { } ^ $ are not escaped because they are either not special
+          # in ERE mid-pattern or cannot appear in file paths.
+          result="${result//\\/\\\\}"
+          result="${result//./\\.}"
+          result="${result//+/\\+}"
+          result="${result//\?/\\?}"
+          result="${result//\[/\\[}"
+          result="${result//\]/\\]}"
+          result="${result//\(/\\(}"
+          result="${result//\)/\\)}"
+          result="${result//|/\\|}"
+          # Restore glob placeholders as regex
+          result="${result//__STAR__/[^/]*}"
+          result="${result//__DOUBLESTAR__/.*}"
+          # Anchor to full path
+          echo "^${result}$"
+        }
+
+        PATTERNS=()
+
+        PATTERNS_FILE="${{ inputs.patterns_file }}"
 
-        # Validate patterns input
-        if [ -z "$PATTERNS_INPUT" ]; then
-          echo "Error: patterns input is required"
+        # Read glob patterns from file, skip comments and blank lines
+        FULL_PATH="${GITHUB_WORKSPACE}/${PATTERNS_FILE}"
+        if [ ! -f "$FULL_PATH" ]; then
+          echo "Error: patterns_file '$FULL_PATH' not found"
+          exit 1
+        fi
+        while IFS= read -r line; do
+          # Remove leading/trailing whitespace
+          line=$(echo "$line" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+          # Skip blank lines and comments
+          if [ -z "$line" ] || [[ "$line" == \#* ]]; then
+            continue
+          fi
+          PATTERNS+=("$(glob_to_regex "$line")")
+        done < "$FULL_PATH"
+
+        # Check if we have any valid patterns
+        if [ ${#PATTERNS[@]} -eq 0 ]; then
+          echo "Error: No valid patterns provided"
           exit 1
         fi
 
@@ -77,23 +132,6 @@ runs:
         echo "Changed files:"
         echo "$CHANGED_FILES"
 
-        # Convert patterns to array and filter out empty lines
-        PATTERNS=()
-        while IFS= read -r pattern; do
-          # Remove leading/trailing whitespace
-          pattern=$(echo "$pattern" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
-          # Skip empty patterns
-          if [ -n "$pattern" ]; then
-            PATTERNS+=("$pattern")
-          fi
-        done <<< "$PATTERNS_INPUT"
-
-        # Check if we have any valid patterns
-        if [ ${#PATTERNS[@]} -eq 0 ]; then
-          echo "Error: No valid patterns provided"
-          exit 1
-        fi
-
         # Initialize arrays
         MATCHED_FILES=()
         UNMATCHED_FILES=()

.github/actions/enumerate-tests/action.yml

@@ -1,36 +1,32 @@
 name: 'Enumerate test projects'
 description: 'Enumerate list of test projects'
 inputs:
-  includeIntegrations:
+  buildArgs:
     required: false
-    type: boolean
-    default: false
-  includeTemplates:
-    required: false
-    type: boolean
-    default: false
-  includeCliE2E:
-    required: false
-    type: boolean
-    default: false
-  includeDeployment:
-    required: false
-    type: boolean
-    default: false
-
+    type: string
+    default: ''
+    description: 'Additional MSBuild arguments passed to the test matrix generation step (e.g., /p:IncludeTemplateTests=true /p:OnlyDeploymentTests=true)'
+
+# Output format: JSON with structure {"include": [{...}, ...]}
+# Each entry contains:
+#   - type: 'regular' | 'collection' | 'class'
+#   - projectName: Full project name (e.g., 'Aspire.Hosting.Tests')
+#   - name: Display name for the test run
+#   - shortname: Short identifier
+#   - testProjectPath: Relative path to the test project
+#   - workitemprefix: Prefix for work item naming
+#   - runs-on: GitHub Actions runner (e.g., 'ubuntu-latest', 'windows-latest')
+#   - testSessionTimeout: Timeout for the test session (e.g., '20m')
+#   - testHangTimeout: Timeout for hung tests (e.g., '10m')
+#   - requiresNugets: Boolean indicating if NuGet packages are needed
+#   - requiresTestSdk: Boolean indicating if test SDK is needed
+#   - extraTestArgs: Additional test arguments (e.g., '--filter-trait "Partition=P1"')
+#   - collection: (collection type only) Collection/partition name
+#   - classname: (class type only) Fully qualified test class name
 outputs:
-  integrations_tests_matrix:
-    description: Integration tests matrix
-    value: ${{ steps.generate_integrations_matrix.outputs.integrations_tests_matrix }}
-  templates_tests_matrix:
-    description: Templates tests matrix
-    value: ${{ steps.generate_templates_matrix.outputs.templates_tests_matrix }}
-  cli_e2e_tests_matrix:
-    description: Cli E2E tests matrix
-    value: ${{ steps.generate_cli_e2e_matrix.outputs.cli_e2e_tests_matrix }}
-  deployment_tests_matrix:
-    description: Deployment E2E tests matrix
-    value: ${{ steps.generate_deployment_matrix.outputs.deployment_tests_matrix }}
+  all_tests:
+    description: Combined matrix of all test entries
+    value: ${{ steps.expand_matrix.outputs.all_tests }}
 runs:
   using: "composite"
   steps:
@@ -42,123 +38,38 @@ runs:
       with:
         global-json-file: ${{ github.workspace }}/global.json
 
-    - name: Get list of integration tests
-      if: ${{ inputs.includeIntegrations }}
-      shell: pwsh
-      run: >
-        dotnet build ${{ github.workspace }}/tests/Shared/GetTestProjects.proj
-        /bl:${{ github.workspace }}/artifacts/log/Debug/GetTestProjects.binlog
-        /p:TestsListOutputPath=${{ github.workspace }}/artifacts/TestsForGithubActions.list
-        /p:ContinuousIntegrationBuild=true
-
-    - name: Generate list of template tests
-      if: ${{ inputs.includeTemplates }}
-      shell: pwsh
-      run: >
-          dotnet build ${{ github.workspace }}/tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj
-          "/t:Build;ExtractTestClassNames"
-          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildTemplatesTests.binlog
-          -p:ExtractTestClassNamesForHelix=true
-          -p:PrepareForHelix=true
-          -p:ExtractTestClassNamesPrefix=Aspire.Templates.Tests
-          -p:InstallBrowsersForPlaywright=false
+    - name: Restore
+      shell: bash
+      run: ./restore.sh
 
-    - name: Generate list of CLI E2E tests
-      if: ${{ inputs.includeCliE2E }}
-      shell: pwsh
-      run: >
-          dotnet build ${{ github.workspace }}/tests/Aspire.Cli.EndToEnd.Tests/Aspire.Cli.EndToEnd.Tests.csproj
-          "/t:Build;ExtractTestClassNames"
-          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildCliEndToEndTests.binlog
-          -p:ExtractTestClassNamesForHelix=true
-          -p:PrepareForHelix=true
-          -p:ExtractTestClassNamesPrefix=Aspire.Cli.EndToEnd.Tests
-          -p:InstallBrowsersForPlaywright=false
+    - name: Build ExtractTestPartitions tool
+      shell: bash
+      run: dotnet build tools/ExtractTestPartitions/ExtractTestPartitions.csproj -c Release --nologo -v quiet
 
-    - name: Generate list of Deployment E2E tests
-      if: ${{ inputs.includeDeployment }}
-      shell: pwsh
+    - name: Generate canonical test matrix
+      shell: bash
       run: >
-          dotnet build ${{ github.workspace }}/tests/Aspire.Deployment.EndToEnd.Tests/Aspire.Deployment.EndToEnd.Tests.csproj
-          "/t:Build;ExtractTestClassNames"
-          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildDeploymentEndToEndTests.binlog
-          -p:ExtractTestClassNamesForHelix=true
-          -p:PrepareForHelix=true
-          -p:ExtractTestClassNamesPrefix=Aspire.Deployment.EndToEnd.Tests
-
-    - name: Generate tests matrix
-      id: generate_integrations_matrix
-      if: ${{ inputs.includeIntegrations }}
-      shell: pwsh
-      run: |
-        $filePath = "${{ github.workspace }}/artifacts/TestsForGithubActions.list"
-        $lines = Get-Content $filePath
-        $jsonObject = @{
-            "shortname" = $lines | Sort-Object
-        }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "integrations_tests_matrix=$jsonString"
-        "integrations_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
-
-    - name: Generate templates matrix
-      id: generate_templates_matrix
-      if: ${{ inputs.includeTemplates }}
-      shell: pwsh
-      run: |
-        $inputFilePath = "${{ github.workspace }}/artifacts/helix/templates-tests/Aspire.Templates.Tests.tests.list"
-        $lines = Get-Content $inputFilePath
-
-        $prefix = "Aspire.Templates.Tests."
-        $lines = Get-Content $inputFilePath | ForEach-Object {
-            $_ -replace "^$prefix", ""
-        }
-
-        $jsonObject = @{
-            "shortname" = $lines | Sort-Object
-        }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "templates_tests_matrix=$jsonString"
-        "templates_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
-
-    - name: Generate cli e2e matrix
-      id: generate_cli_e2e_matrix
-      if: ${{ inputs.includeCliE2E }}
+        ./build.sh -test
+        /p:TestRunnerName=TestEnumerationRunsheetBuilder
+        /p:TestMatrixOutputPath=artifacts/canonical-test-matrix.json
+        /p:GenerateCIPartitions=true
+        /bl
+        ${{ inputs.buildArgs }}
+
+    - name: Expand matrix for GitHub Actions
+      id: expand_matrix
       shell: pwsh
       run: |
-        $inputFilePath = "${{ github.workspace }}/artifacts/helix/cli-e2e-tests/Aspire.Cli.EndToEnd.Tests.tests.list"
-        $lines = Get-Content $inputFilePath
-
-        $prefix = "Aspire.Cli.EndToEnd.Tests."
-        $lines = @(Get-Content $inputFilePath | ForEach-Object {
-            $_ -replace "^$prefix", ""
-        })
-
-        $jsonObject = @{
-            "shortname" = @($lines | Sort-Object)
-        }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "cli_e2e_tests_matrix=$jsonString"
-        "cli_e2e_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
-
-    - name: Generate deployment matrix
-      id: generate_deployment_matrix
-      if: ${{ inputs.includeDeployment }}
-      shell: pwsh
-      run: |
-        $inputFilePath = "${{ github.workspace }}/artifacts/helix/deployment-e2e-tests/Aspire.Deployment.EndToEnd.Tests.tests.list"
-        $lines = Get-Content $inputFilePath
-
-        $prefix = "Aspire.Deployment.EndToEnd.Tests."
-        $lines = @(Get-Content $inputFilePath | ForEach-Object {
-            $_ -replace "^$prefix", ""
-        })
-
-        $jsonObject = @{
-            "shortname" = @($lines | Sort-Object)
+        $canonicalMatrixPath = "${{ github.workspace }}/artifacts/canonical-test-matrix.json"
+        $expandScript = "${{ github.workspace }}/eng/scripts/expand-test-matrix-github.ps1"
+
+        if (Test-Path $canonicalMatrixPath) {
+          & $expandScript -CanonicalMatrixFile $canonicalMatrixPath -OutputToGitHubEnv
+        } else {
+          $emptyMatrix = '{"include":[]}'
+          "all_tests=$emptyMatrix" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+          Write-Host "No canonical test matrix found, using empty matrix"
         }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "deployment_tests_matrix=$jsonString"
-        "deployment_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
 
     - name: Upload logs
       if: always()
@@ -167,4 +78,6 @@ runs:
         name: logs-enumerate-tests-${{ runner.os }}
         path: |
           artifacts/log/**/*.binlog
-          artifacts/**/*.list
+          artifacts/**/*tests-partitions.json
+          artifacts/**/*tests-metadata.json
+          artifacts/canonical-test-matrix.json

.github/instructions/test-review-guidelines.instructions.md

@@ -0,0 +1,28 @@
+# Test Review Guidelines: Flaky Test Patterns
+
+When reviewing test code or writing new tests, watch for these common patterns that lead to flaky tests. These patterns apply broadly across the Aspire test suite and are useful for **code review**, **test authoring**, and **root cause analysis** of intermittent failures.
+
+## Common Flaky Test Patterns
+
+| Pattern | Symptom | What to look for | Fix |
+|---------|---------|-------------------|-----|
+| **Thread-unsafe collections** | `Assert.Contains()` missing items; assertion sees partial data | Test fakes/mocks using `List<T>`, `Dictionary<T>`, or other non-thread-safe types that are mutated from concurrent callers (e.g., pipeline steps running via `Task.WhenAll`) | Add `lock` synchronization to mutation methods, or use `ConcurrentBag<T>` / `ConcurrentDictionary<T>`. Check **all** test fakes used by the test, not just the one in the stack trace. |
+| **Race condition on startup** | Intermittent timeout or "not started" errors | `WaitForTextAsync("Application started.")` — log-based readiness checks are fragile under CI contention because log lines can arrive out of order or be delayed | Use `WaitForHealthyAsync()` or structured readiness checks instead of log text matching |
+| **Shared timeout budget** | `TaskCanceledException` in fixture `InitializeAsync`; one phase starves the other | A single `CancellationTokenSource` shared across startup and readiness phases | Use separate `CancellationTokenSource` for each phase |
+| **Sequential service waits** | `TaskCanceledException` in `WaitReadyStateAsync`; timeout under CI load | Waiting for multiple services one after another, where total wait = sum of individual waits | Wait for services in parallel with `Task.WhenAll` instead of sequentially |
+| **Port conflicts** | `AddressInUseException` or `SocketException` | `randomizePorts: false` or hardcoded port numbers in test setup | Ensure `randomizePorts: true` in `TestDistributedApplicationBuilder.Create()` |
+| **File locking (Windows)** | `IOException: The process cannot access the file` on Windows CI | Tests that create/read temp files without proper cleanup or exclusive access | Add retry logic, use unique temp directories per test, or ensure proper `IDisposable` cleanup |
+| **Order-dependent state** | Test passes alone, fails when run with other tests | Static state, shared singletons, or environment variable mutations without cleanup | Ensure proper test isolation; use fresh instances in each test; clean up static state |
+| **Contention-only failure** | Passes 100% in isolation, fails 10–20% in quarantine runs | Shared resources (ports, CTS, fixtures); the test only fails when running alongside other tests | Look for shared resources; parallelize waits; add timing margins; consider test isolation improvements |
+| **Snapshot drift** | `VerifyException` with unexpected diff in Verify snapshots | Test output includes timestamps, GUIDs, or environment-specific paths | Use Verify scrubbers to normalize dynamic content; update snapshots with `dotnet verify accept -y` |
+
+## Review Checklist for Test PRs
+
+When reviewing PRs that add or modify tests, check for:
+
+- [ ] **Thread safety**: Are test fakes/mocks mutated from concurrent code paths? If so, are they synchronized?
+- [ ] **Readiness checks**: Does the test use `WaitForHealthyAsync()` rather than `WaitForTextAsync()` for service readiness?
+- [ ] **Timeout isolation**: Does each phase (startup, readiness, assertion) have its own timeout budget?
+- [ ] **Port randomization**: Is `randomizePorts: true` used (or is the default relied upon)?
+- [ ] **Test isolation**: Does the test clean up all shared state? No static mutations without restoration?
+- [ ] **Platform considerations**: Will this test work on Windows, Linux, and macOS? Watch for path separators, file locking, and encoding differences.