From afecaa9df12e3f3ded9ca3ef700701aaabdc529f Mon Sep 17 00:00:00 2001 From: Anh Toan Bui Long Date: Fri, 19 Jun 2026 09:18:33 +0200 Subject: [PATCH 1/4] Change default log writing onto console instead of Loki. --- CometServer/appsettings.Production.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/CometServer/appsettings.Production.json b/CometServer/appsettings.Production.json index 638b7668..0c5cb8b7 100644 --- a/CometServer/appsettings.Production.json +++ b/CometServer/appsettings.Production.json @@ -90,19 +90,7 @@ }, "WriteTo": [ { - "Name": "GrafanaLoki", - "Args": { - "uri": "http://localhost:3100", - "labels": [ - { - "key": "app", - "value": "CDP4-COMET WebServices-01" - } - ], - "propertiesAsLabels": [ - "app" - ] - } + "Name": "Console" } ], "WriteTo:Async": { From be7b367df34182225413f6857ab54432382d11ae Mon Sep 17 00:00:00 2001 From: Anh Toan Bui Long Date: Mon, 22 Jun 2026 14:39:43 +0200 Subject: [PATCH 2/4] Bump Message Pack --- CometServer/CometServer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CometServer/CometServer.csproj b/CometServer/CometServer.csproj index b194c000..494ebec2 100644 --- a/CometServer/CometServer.csproj +++ b/CometServer/CometServer.csproj @@ -18,7 +18,7 @@ - + From f55d56d671354921f002f321e79faf0a99c7975d Mon Sep 17 00:00:00 2001 From: ToanAtStarionGroup <132551692+ToanAtStarionGroup@users.noreply.github.com> Date: Thu, 2 Jul 2026 09:46:45 +0200 Subject: [PATCH 3/4] Update CDP4MessagePackSerializer-CE to version 30.1.2 --- CometServer/CometServer.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CometServer/CometServer.csproj b/CometServer/CometServer.csproj index 494ebec2..0aa5b299 100644 --- a/CometServer/CometServer.csproj +++ b/CometServer/CometServer.csproj @@ -18,7 +18,7 @@ - + @@ -93,4 +93,4 @@ - \ No newline at end of file + From 80421772233472c0a03d5021b986aaed4da86fd1 Mon Sep 17 00:00:00 2001 From: Anh Toan Bui Long Date: Tue, 1 Sep 2026 14:49:23 +0200 Subject: [PATCH 4/4] Put test in sequence. --- .github/workflows/CodeQuality.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml index cda85710..dbc56381 100644 --- a/.github/workflows/CodeQuality.yml +++ b/.github/workflows/CodeQuality.yml @@ -127,7 +127,19 @@ jobs: run: dotnet restore integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln - name: Run Integration Tests - run: dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln --logger "trx;LogFileName=test_results.trx" --verbosity detailed + run: | + set +e + dotnet test integration-tests/IntegrationTestSuite/MessagePackIntegrationTests/MessagePackIntegrationTests.csproj \ + --settings integration-tests/IntegrationTestSuite/.runsettings \ + --logger "trx;LogFileName=msgpack_results.trx" --verbosity detailed + MESSAGEPACK_EXIT=$? + dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests/WebservicesIntegrationTests.csproj \ + --settings integration-tests/IntegrationTestSuite/.runsettings \ + --logger "trx;LogFileName=test_results.trx" --verbosity detailed + WEBSERVICES_EXIT=$? + echo "MessagePackIntegrationTests exit code: $MESSAGEPACK_EXIT" + echo "WebservicesIntegrationTests exit code: $WEBSERVICES_EXIT" + [ $MESSAGEPACK_EXIT -eq 0 ] && [ $WEBSERVICES_EXIT -eq 0 ] - name: Shutdown Integration Test session run: dotnet-coverage shutdown integrationtestsession