From 6e23533e54afbdaebe1356051ce21dc6352aec23 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:57:33 +0000 Subject: [PATCH 1/7] Initial plan From d9a7c120fc442c77a065a4bad626b3869d386b8a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:05:54 +0000 Subject: [PATCH 2/7] Add test-reporter action to workflows and TRX logging to test execution Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- Content/Console/.github/workflows/build.yml | 7 +++++++ Content/Console/build/build.fs | 1 + Content/Library/.github/workflows/build.yml | 7 +++++++ Content/Library/build/build.fs | 1 + 4 files changed, 16 insertions(+) diff --git a/Content/Console/.github/workflows/build.yml b/Content/Console/.github/workflows/build.yml index fcc4c213..f029d73f 100644 --- a/Content/Console/.github/workflows/build.yml +++ b/Content/Console/.github/workflows/build.yml @@ -49,6 +49,13 @@ jobs: env: CONFIGURATION: ${{ matrix.configuration }} CI: true + - name: Test Report + uses: dorny/test-reporter@v1 + if: always() + with: + name: Test Results (${{ matrix.os }}-${{ matrix.configuration }}) + path: '**/TestResults/testResults*.trx' + reporter: dotnet-trx # Builds the project in a dev container build-devcontainer: runs-on: ubuntu-latest diff --git a/Content/Console/build/build.fs b/Content/Console/build/build.fs index 222a5ec9..08b7b784 100644 --- a/Content/Console/build/build.fs +++ b/Content/Console/build/build.fs @@ -345,6 +345,7 @@ let dotnetTest ctx = c with MSBuildParams = disableBinLog c.MSBuildParams Configuration = configuration (ctx.Context.AllExecutingTargets) + Logger = Some "trx;LogFilePrefix=testResults" Common = c.Common |> DotNet.Options.withAdditionalArgs args diff --git a/Content/Library/.github/workflows/build.yml b/Content/Library/.github/workflows/build.yml index 3b7b7e52..7806071f 100644 --- a/Content/Library/.github/workflows/build.yml +++ b/Content/Library/.github/workflows/build.yml @@ -39,6 +39,13 @@ jobs: CI: true CONFIGURATION: ${{ matrix.configuration }} ENABLE_COVERAGE: true + - name: Test Report + uses: dorny/test-reporter@v1 + if: always() + with: + name: Test Results (${{ matrix.os }}-${{ matrix.configuration }}) + path: '**/TestResults/testResults*.trx' + reporter: dotnet-trx # Builds the project in a dev container build-devcontainer: runs-on: ubuntu-latest diff --git a/Content/Library/build/build.fs b/Content/Library/build/build.fs index d4ea8943..90672019 100644 --- a/Content/Library/build/build.fs +++ b/Content/Library/build/build.fs @@ -436,6 +436,7 @@ let dotnetTest ctx = c with MSBuildParams = disableBinLog c.MSBuildParams Configuration = configuration (ctx.Context.AllExecutingTargets) + Logger = Some "trx;LogFilePrefix=testResults" Common = c.Common |> DotNet.Options.withAdditionalArgs args From dedef80ef502b240511373e78fdef5a8b63d9711 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:29:15 +0000 Subject: [PATCH 3/7] Add test-reporter to main repository workflows and build script Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- .github/workflows/build.yml | 7 ++++++ build/build.fs | 50 +++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19d349d5..90c6a0de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,13 @@ jobs: env: CONFIGURATION: ${{ matrix.configuration }} CI: true + - name: Test Report + uses: dorny/test-reporter@v1 + if: always() + with: + name: Test Results (${{ matrix.os }}-${{ matrix.configuration }}) + path: '**/TestResults/testResults*.trx' + reporter: dotnet-trx # Builds the project in a dev container build-devcontainer: diff --git a/build/build.fs b/build/build.fs index 80cd213c..4cd5524b 100644 --- a/build/build.fs +++ b/build/build.fs @@ -351,35 +351,31 @@ let getPkgPath () = let integrationTests ctx = !!testsGlob |> Seq.iter (fun proj -> + let testArgs = + [ + "--summary" + if isCI.Value then + "--fail-on-focused-tests" + ] + |> String.concat " " - dotnet.run - (fun c -> + let args = [ sprintf "-- %s" testArgs ] - let args = - [ - // sprintf "-C %A" (configuration (ctx.Context.AllExecutingTargets)) - sprintf "--project %s" proj - "--summary" - if isCI.Value then - "--fail-on-focused-tests" - ] - |> String.concat " " - - { - c with - CustomParams = Some args - Environment = - c.Environment - |> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ()) - // Configuration = configuration (ctx.Context.AllExecutingTargets) - // Common = - // c.Common - // |> DotNet.Options.withCustomParams - // (Some(args)) - } - ) - "" - |> failOnBadExitAndPrint + DotNet.test + (fun c -> { + c with + Configuration = configuration (ctx.Context.AllExecutingTargets) + Logger = Some "trx;LogFilePrefix=testResults" + Common = + { + c.Common with + Environment = + c.Common.Environment + |> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ()) + } + |> DotNet.Options.withAdditionalArgs args + }) + proj ) let dotnetPack ctx = From 36d390f1be925a0b4ef9f4ffa74cf8758b97b1f7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:44:44 +0000 Subject: [PATCH 4/7] Fix test runner arguments to use Expecto RunSettings format Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- build/build.fs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/build.fs b/build/build.fs index 4cd5524b..8629e255 100644 --- a/build/build.fs +++ b/build/build.fs @@ -351,15 +351,13 @@ let getPkgPath () = let integrationTests ctx = !!testsGlob |> Seq.iter (fun proj -> - let testArgs = + let runSettingsArgs = [ - "--summary" + "Expecto.summary=true" if isCI.Value then - "--fail-on-focused-tests" + "Expecto.fail-on-focused-tests=true" ] - |> String.concat " " - - let args = [ sprintf "-- %s" testArgs ] + |> List.map (sprintf "-- %s") DotNet.test (fun c -> { @@ -373,7 +371,7 @@ let integrationTests ctx = c.Common.Environment |> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ()) } - |> DotNet.Options.withAdditionalArgs args + |> DotNet.Options.withAdditionalArgs runSettingsArgs }) proj ) From 614c010d0f8cd7fb450b5380aeb86dabcb359090 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:53:29 +0000 Subject: [PATCH 5/7] Remove invalid Expecto.summary=true argument Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- build/build.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/build/build.fs b/build/build.fs index 8629e255..6045c086 100644 --- a/build/build.fs +++ b/build/build.fs @@ -353,7 +353,6 @@ let integrationTests ctx = |> Seq.iter (fun proj -> let runSettingsArgs = [ - "Expecto.summary=true" if isCI.Value then "Expecto.fail-on-focused-tests=true" ] From 7821bae2a463071cf7d766d76a296bc0efe9ce0a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 13:08:30 +0000 Subject: [PATCH 6/7] Fix test runner arguments - pass -- and parameters as separate args Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- build/build.fs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/build.fs b/build/build.fs index 6045c086..944f95f4 100644 --- a/build/build.fs +++ b/build/build.fs @@ -352,11 +352,13 @@ let integrationTests ctx = !!testsGlob |> Seq.iter (fun proj -> let runSettingsArgs = - [ - if isCI.Value then + if isCI.Value then + [ + "--" "Expecto.fail-on-focused-tests=true" - ] - |> List.map (sprintf "-- %s") + ] + else + [] DotNet.test (fun c -> { From 7b5912804d57e600a0025d6ce988d06c153e073d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 1 Nov 2025 13:20:45 +0000 Subject: [PATCH 7/7] Add console logger with detailed verbosity for CI output Co-authored-by: TheAngryByrd <1490044+TheAngryByrd@users.noreply.github.com> --- build/build.fs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/build.fs b/build/build.fs index 944f95f4..46afb699 100644 --- a/build/build.fs +++ b/build/build.fs @@ -364,7 +364,7 @@ let integrationTests ctx = (fun c -> { c with Configuration = configuration (ctx.Context.AllExecutingTargets) - Logger = Some "trx;LogFilePrefix=testResults" + Logger = Some "console;verbosity=detailed" Common = { c.Common with @@ -372,7 +372,13 @@ let integrationTests ctx = c.Common.Environment |> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ()) } - |> DotNet.Options.withAdditionalArgs runSettingsArgs + |> DotNet.Options.withAdditionalArgs ( + [ + "--logger" + "trx;LogFilePrefix=testResults" + ] + @ runSettingsArgs + ) }) proj )