diff --git a/MessagingService.BusinessLogic.Tests/Mediator/MediatorTests.cs b/MessagingService.BusinessLogic.Tests/Mediator/MediatorTests.cs index 4b8655d..c5fde31 100644 --- a/MessagingService.BusinessLogic.Tests/Mediator/MediatorTests.cs +++ b/MessagingService.BusinessLogic.Tests/Mediator/MediatorTests.cs @@ -60,25 +60,12 @@ public async Task Mediator_Send_RequestHandled() { } } - private IConfigurationRoot SetupMemoryConfiguration() { - Dictionary configuration = new Dictionary(); + private IConfigurationRoot SetupMemoryConfiguration() + { + Dictionary configuration = TestData.GetStandardMemoryConfiguration(); IConfigurationBuilder builder = new ConfigurationBuilder(); - configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString"); - configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1"); - configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113"); - configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection"); - configuration.Add("EventStoreSettings:UserName", "admin"); - configuration.Add("EventStoreSettings:Password", "changeit"); - configuration.Add("AppSettings:UseConnectionStringConfig", "false"); - configuration.Add("AppSettings:SecurityService", "http://127.0.0.1"); - configuration.Add("AppSettings:MessagingServiceApi", "http://127.0.0.1"); - configuration.Add("AppSettings:TransactionProcessorApi", "http://127.0.0.1"); - configuration.Add("AppSettings:DatabaseEngine", "SqlServer"); - configuration.Add("AppSettings:EmailProxy", "UnitTest"); - configuration.Add("AppSettings:SMSProxy", "UnitTest"); - builder.AddInMemoryCollection(configuration); return builder.Build(); diff --git a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj index a75f3b3..6848542 100644 --- a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj +++ b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj @@ -1,22 +1,22 @@  - net7.0 + net8.0 None false - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj index 4f60807..7e79479 100644 --- a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj +++ b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj index 18c7260..1e15c2d 100644 --- a/MessagingService.Client/MessagingService.Client.csproj +++ b/MessagingService.Client/MessagingService.Client.csproj @@ -1,12 +1,12 @@  - net7.0;netstandard2.0 + net8.0;netstandard2.1 $(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets - + diff --git a/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj b/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj index 52ee4dd..a9ee6c5 100644 --- a/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj +++ b/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj @@ -1,7 +1,7 @@  - net7.0;netstandard2.0 + net8.0;netstandard2.1 diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index 4145cd6..5afb34e 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -1,21 +1,21 @@  - net7.0 + net8.0 None false - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj index 5ac3245..4ccd324 100644 --- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj +++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj @@ -1,12 +1,12 @@  - net7.0 + net8.0 - - + + diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj index bbb1a52..8a46e81 100644 --- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj +++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 - - - + + + diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj index 79b3345..39eabad 100644 --- a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj +++ b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 enable enable - + diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index 06066d4..b01fb00 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -1,26 +1,26 @@  - net7.0 + net8.0 false - + - + - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.Models/MessagingService.Models.csproj b/MessagingService.Models/MessagingService.Models.csproj index cfadb03..30402ac 100644 --- a/MessagingService.Models/MessagingService.Models.csproj +++ b/MessagingService.Models/MessagingService.Models.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj index 1fe167e..ebab47c 100644 --- a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj +++ b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj @@ -1,20 +1,20 @@ - net7.0 + net8.0 None false - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj index 8e52d0c..976fb59 100644 --- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj +++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj @@ -1,11 +1,11 @@  - net7.0 + net8.0 - + diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj index 23bb058..dc1bfa0 100644 --- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj +++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj @@ -1,12 +1,12 @@  - net7.0 + net8.0 - - + + diff --git a/MessagingService.Testing/MessagingService.Testing.csproj b/MessagingService.Testing/MessagingService.Testing.csproj index 12cdadf..6214ee8 100644 --- a/MessagingService.Testing/MessagingService.Testing.csproj +++ b/MessagingService.Testing/MessagingService.Testing.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 None diff --git a/MessagingService.Testing/TestData.cs b/MessagingService.Testing/TestData.cs index 041dfeb..eeb0c79 100644 --- a/MessagingService.Testing/TestData.cs +++ b/MessagingService.Testing/TestData.cs @@ -16,6 +16,7 @@ using SMSMessageStatus = BusinessLogic.Services.SMSServices.MessageStatus; using EmailMessageStatusResponse = BusinessLogic.Services.EmailServices.MessageStatusResponse; using SMSMessageStatusResponse = BusinessLogic.Services.SMSServices.MessageStatusResponse; + using Microsoft.Extensions.Configuration; public class TestData { @@ -325,6 +326,27 @@ public static SMSAggregate GetSentSMSAggregate() smsAggregate.ReceiveResponseFromProvider(TestData.ProviderSMSReference); return smsAggregate; } + + public static Dictionary GetStandardMemoryConfiguration() + { + Dictionary configuration = new Dictionary(); + + IConfigurationBuilder builder = new ConfigurationBuilder(); + + configuration.Add("AppSettings:EmailProxy", "UnitTest"); + configuration.Add("AppSettings:SMSProxy", "UnitTest"); + configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString"); + configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1"); + configuration.Add("EventStoreSettings:ConnectionString", "esdb://127.0.0.1:2113"); + configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection"); + configuration.Add("EventStoreSettings:UserName", "admin"); + configuration.Add("EventStoreSettings:Password", "changeit"); + configuration.Add("AppSettings:UseConnectionStringConfig", "false"); + configuration.Add("AppSettings:SecurityService", "http://127.0.0.1"); + configuration.Add("AppSettings:MessagingServiceApi", "http://127.0.0.1"); + + return configuration; + } } public record TestEvent : DomainEvent diff --git a/MessagingService.Tests/General/BootstrapperTests.cs b/MessagingService.Tests/General/BootstrapperTests.cs index 67eb19b..63c7887 100644 --- a/MessagingService.Tests/General/BootstrapperTests.cs +++ b/MessagingService.Tests/General/BootstrapperTests.cs @@ -12,6 +12,7 @@ namespace MessagingService.Tests.General using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Moq; + using Testing; using Xunit; [Collection("TestCollection")] @@ -36,24 +37,11 @@ public void VerifyBootstrapperIsValid() Startup.Container.AssertConfigurationIsValid(AssertMode.Full); } - private IConfigurationRoot SetupMemoryConfiguration() - { - Dictionary configuration = new Dictionary(); + private IConfigurationRoot SetupMemoryConfiguration(){ + Dictionary configuration = TestData.GetStandardMemoryConfiguration(); IConfigurationBuilder builder = new ConfigurationBuilder(); - configuration.Add("AppSettings:EmailProxy", "UnitTest"); - configuration.Add("AppSettings:SMSProxy", "UnitTest"); - configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString"); - configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1"); - configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113"); - configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection"); - configuration.Add("EventStoreSettings:UserName", "admin"); - configuration.Add("EventStoreSettings:Password", "changeit"); - configuration.Add("AppSettings:UseConnectionStringConfig", "false"); - configuration.Add("AppSettings:SecurityService", "http://127.0.0.1"); - configuration.Add("AppSettings:MessagingServiceApi", "http://127.0.0.1"); - builder.AddInMemoryCollection(configuration); return builder.Build(); diff --git a/MessagingService.Tests/MessagingService.Tests.csproj b/MessagingService.Tests/MessagingService.Tests.csproj index 70e8370..4ece507 100644 --- a/MessagingService.Tests/MessagingService.Tests.csproj +++ b/MessagingService.Tests/MessagingService.Tests.csproj @@ -1,29 +1,30 @@  - net7.0 + net8.0 None false - - - - + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/MessagingService/Dockerfile b/MessagingService/Dockerfile index 31538fd..590e807 100644 --- a/MessagingService/Dockerfile +++ b/MessagingService/Dockerfile @@ -3,7 +3,7 @@ FROM stuartferguson/txnprocbase AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build # Set the ARG for your GitHub Secret ARG NUGET_TOKEN diff --git a/MessagingService/Dockerfilewindows b/MessagingService/Dockerfilewindows index c441f8c..420b1bc 100644 --- a/MessagingService/Dockerfilewindows +++ b/MessagingService/Dockerfilewindows @@ -2,7 +2,7 @@ FROM stuartferguson/txnprocbasewindows AS base USER ContainerAdministrator WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:7.0-windowsservercore-ltsc2019 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2019 AS build WORKDIR /src COPY ["MessagingService/NuGet.Config", "."] COPY ["MessagingService/MessagingService.csproj", "MessagingService/"] diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj index de4f951..4de5c13 100644 --- a/MessagingService/MessagingService.csproj +++ b/MessagingService/MessagingService.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Linux @@ -10,25 +10,25 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - + diff --git a/MessagingService/Startup.cs b/MessagingService/Startup.cs index 28242c0..b0d8791 100644 --- a/MessagingService/Startup.cs +++ b/MessagingService/Startup.cs @@ -63,13 +63,9 @@ public static void LoadTypes() public static void ConfigureEventStoreSettings(EventStoreClientSettings settings) { - settings.ConnectivitySettings = EventStoreClientConnectivitySettings.Default; - settings.ConnectivitySettings.Address = new Uri(Startup.Configuration.GetValue("EventStoreSettings:ConnectionString")); - settings.ConnectivitySettings.Insecure = Startup.Configuration.GetValue("EventStoreSettings:Insecure"); + String connectionString = Startup.Configuration.GetValue("EventStoreSettings:ConnectionString"); - settings.DefaultCredentials = new UserCredentials(Startup.Configuration.GetValue("EventStoreSettings:UserName"), - Startup.Configuration.GetValue("EventStoreSettings:Password")); - Startup.EventStoreClientSettings = settings; + Startup.EventStoreClientSettings = EventStoreClientSettings.Create(connectionString); ; } public static Container Container;