From d10d1a6fdbffcbda6f0b9e884459aa03dea77de9 Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Tue, 19 Aug 2025 18:59:01 +0200 Subject: [PATCH 1/5] Docker push and build for production branch as well --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index dd28f5c..4935831 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,6 +60,7 @@ steps: when: branch: - main + - production depends_on: - compile (.NET) - test From a10070b9c773a8ca7d206fc600df28d6e9a64c0a Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Sun, 21 Sep 2025 10:50:08 +0200 Subject: [PATCH 2/5] Add seq api key support --- .../Common/DependencyInjectionExtensions.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs b/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs index 33acf4f..143a210 100644 --- a/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs +++ b/src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs @@ -34,7 +34,14 @@ public static class DependencyInjectionExtensions string? seqHost = builder.Configuration.GetConnectionString("seq"); if (!string.IsNullOrEmpty(seqHost)) { - builder.AddSeqEndpoint("seq"); + builder.AddSeqEndpoint("seq", o => + { + var apiKey = builder.Configuration.GetValue("seq-api-key"); + if (!string.IsNullOrEmpty(apiKey)) + { + o.ApiKey = apiKey; + } + }); } return builder; From d4fff6741c68cdf88820c506f1bbb7dc911df670 Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Sun, 21 Sep 2025 10:50:33 +0200 Subject: [PATCH 3/5] Update packages --- src/Vegasco.Server.Api/Vegasco.Server.Api.csproj | 16 ++++++++-------- .../Vegasco.Server.AppHost.csproj | 8 ++++---- .../Vegasco.Server.ServiceDefaults.csproj | 4 ++-- .../Vegasco.Server.Api.Tests.Integration.csproj | 14 +++++++------- .../Vegasco.Server.Api.Tests.Unit.csproj | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj b/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj index 461fc82..aa38f0e 100644 --- a/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj +++ b/src/Vegasco.Server.Api/Vegasco.Server.Api.csproj @@ -13,24 +13,24 @@ - - + + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + diff --git a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj index 6f4dfb9..12eddb3 100644 --- a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj +++ b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj @@ -12,13 +12,13 @@ - - - + + + 3.7.115 - + diff --git a/src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj b/src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj index f5a831a..4201046 100644 --- a/src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj +++ b/src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj index 8007836..7c739c4 100644 --- a/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj +++ b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj @@ -10,21 +10,21 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj b/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj index a2a53a7..e7413e5 100644 --- a/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj +++ b/tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj @@ -14,12 +14,12 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 527759eb7b65cef6bb443107ddaaad7117bebb95 Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Sun, 21 Sep 2025 10:56:56 +0200 Subject: [PATCH 4/5] Fix fluent assertions version --- .../Vegasco.Server.Api.Tests.Integration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj index 7c739c4..9500e01 100644 --- a/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj +++ b/tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj @@ -16,7 +16,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 69901a295c6edb8809e632cce8a90b39c30e2e89 Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Sun, 21 Sep 2025 11:07:26 +0200 Subject: [PATCH 5/5] Do not build and push docker image for pull requests --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 4935831..3b31e42 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,6 +61,9 @@ steps: branch: - main - production + event: + exclude: + - pull_request depends_on: - compile (.NET) - test