From a69e78185b34cea6c895a566bd9f05936fad4fcd Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 28 Nov 2025 13:59:30 +0100 Subject: [PATCH 1/3] C#: Pin tests and mark .NET 10 tests as flaky. --- csharp/ql/integration-tests/all-platforms/blazor/global.json | 5 +++++ .../all-platforms/blazor_build_mode_none/global.json | 5 +++++ .../integration-tests/all-platforms/blazor_net_8/global.json | 5 +++++ csharp/ql/integration-tests/all-platforms/dotnet_10/test.py | 4 ++++ .../all-platforms/standalone_failed/global.json | 5 +++++ .../global.json | 5 +++++ .../global.json | 5 +++++ 7 files changed, 34 insertions(+) create mode 100644 csharp/ql/integration-tests/all-platforms/blazor/global.json create mode 100644 csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json create mode 100644 csharp/ql/integration-tests/all-platforms/blazor_net_8/global.json create mode 100644 csharp/ql/integration-tests/all-platforms/standalone_failed/global.json create mode 100644 csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json create mode 100644 csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json diff --git a/csharp/ql/integration-tests/all-platforms/blazor/global.json b/csharp/ql/integration-tests/all-platforms/blazor/global.json new file mode 100644 index 000000000000..d488208a2a75 --- /dev/null +++ b/csharp/ql/integration-tests/all-platforms/blazor/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.304" + } +} diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json new file mode 100644 index 000000000000..d488208a2a75 --- /dev/null +++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.304" + } +} diff --git a/csharp/ql/integration-tests/all-platforms/blazor_net_8/global.json b/csharp/ql/integration-tests/all-platforms/blazor_net_8/global.json new file mode 100644 index 000000000000..402fd8496913 --- /dev/null +++ b/csharp/ql/integration-tests/all-platforms/blazor_net_8/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "8.0.401" + } +} \ No newline at end of file diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py index 903d34300616..4c624cff4f21 100644 --- a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py +++ b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py @@ -1,5 +1,9 @@ +import pytest + +@pytest.mark.flaky(rerun_filter=lambda args*: runs_on.macos) def test1(codeql, csharp): codeql.database.create() +@pytest.mark.flaky(rerun_filter=lambda args*: runs_on.macos) def test2(codeql, csharp): codeql.database.create(build_mode="none") diff --git a/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json b/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json new file mode 100644 index 000000000000..4c6e2601f69c --- /dev/null +++ b/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.304" + } +} diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json new file mode 100644 index 000000000000..d488208a2a75 --- /dev/null +++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.304" + } +} diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json new file mode 100644 index 000000000000..d488208a2a75 --- /dev/null +++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.304" + } +} From af41ca0b1cdabd1e56687d2e97b17b23eb19eac2 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 28 Nov 2025 14:13:17 +0100 Subject: [PATCH 2/3] C#: Fix syntax error. --- csharp/ql/integration-tests/all-platforms/dotnet_10/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py index 4c624cff4f21..a6c0f430b64e 100644 --- a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py +++ b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py @@ -1,9 +1,9 @@ import pytest -@pytest.mark.flaky(rerun_filter=lambda args*: runs_on.macos) +@pytest.mark.flaky(rerun_filter=lambda *args: runs_on.macos) def test1(codeql, csharp): codeql.database.create() -@pytest.mark.flaky(rerun_filter=lambda args*: runs_on.macos) +@pytest.mark.flaky(rerun_filter=lambda *args: runs_on.macos) def test2(codeql, csharp): codeql.database.create(build_mode="none") From 6c9d15879f760e60c8ed5242f2898930dae8469b Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 28 Nov 2025 14:20:06 +0100 Subject: [PATCH 3/3] C#: Skip .NET 10 tests for now. --- csharp/ql/integration-tests/all-platforms/dotnet_10/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py index a6c0f430b64e..d34be2b8b506 100644 --- a/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py +++ b/csharp/ql/integration-tests/all-platforms/dotnet_10/test.py @@ -1,9 +1,9 @@ import pytest -@pytest.mark.flaky(rerun_filter=lambda *args: runs_on.macos) +@pytest.mark.skip(reason=".NET 10 info command crashes") def test1(codeql, csharp): codeql.database.create() -@pytest.mark.flaky(rerun_filter=lambda *args: runs_on.macos) +@pytest.mark.skip(reason=".NET 10 info command crashes") def test2(codeql, csharp): codeql.database.create(build_mode="none")