From b678ff2549ab75efbec5befd01344b84ea23b566 Mon Sep 17 00:00:00 2001 From: mpaulosky Date: Sat, 4 Jul 2026 08:20:18 -0700 Subject: [PATCH 1/2] fix: align AspireManager with main to unblock #427 --- tests/AppHost.Tests/Infrastructure/AspireManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AppHost.Tests/Infrastructure/AspireManager.cs b/tests/AppHost.Tests/Infrastructure/AspireManager.cs index bea6801..755c0ac 100644 --- a/tests/AppHost.Tests/Infrastructure/AspireManager.cs +++ b/tests/AppHost.Tests/Infrastructure/AspireManager.cs @@ -84,7 +84,7 @@ await retryPolicy.ExecuteAsync(async _ => configureBuilder: static (options, _) => { options.DisableDashboard = true; - }, + }, cancellationToken: CancellationToken.None); // sufficient — Aspire DCP may override ASPNETCORE_ENVIRONMENT based on its own // EnvironmentName when launching child processes. The annotation guarantees the From dc74c77a7c7a3f5168cc79fcb9e8f92fb33c2365 Mon Sep 17 00:00:00 2001 From: mpaulosky Date: Sat, 4 Jul 2026 08:27:24 -0700 Subject: [PATCH 2/2] ci: trigger required yamllint context for #432 --- .github/workflows/squad-standard-lint-yaml.yml | 2 ++ tests/AppHost.Tests/Infrastructure/AspireManager.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/squad-standard-lint-yaml.yml b/.github/workflows/squad-standard-lint-yaml.yml index b8049c0..1bb7f58 100644 --- a/.github/workflows/squad-standard-lint-yaml.yml +++ b/.github/workflows/squad-standard-lint-yaml.yml @@ -1,5 +1,7 @@ name: lint-yaml +# Keep touched in conflict-fix helper PRs when required yamllint context is pending. + on: pull_request: branches: [dev, main] diff --git a/tests/AppHost.Tests/Infrastructure/AspireManager.cs b/tests/AppHost.Tests/Infrastructure/AspireManager.cs index 755c0ac..bea6801 100644 --- a/tests/AppHost.Tests/Infrastructure/AspireManager.cs +++ b/tests/AppHost.Tests/Infrastructure/AspireManager.cs @@ -84,7 +84,7 @@ await retryPolicy.ExecuteAsync(async _ => configureBuilder: static (options, _) => { options.DisableDashboard = true; - }, + }, cancellationToken: CancellationToken.None); // sufficient — Aspire DCP may override ASPNETCORE_ENVIRONMENT based on its own // EnvironmentName when launching child processes. The annotation guarantees the