Merge pull request #161 from TransactionProcessing/task/#159_net_8_upgrade

StuartFerguson · web-flow · commit 0ae7021932ba · 2024-03-26T09:29:28.000Z
Net 8 and Latest ES upgrade
diff --git 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<String, String> configuration = new Dictionary<String, String>();
+        private IConfigurationRoot SetupMemoryConfiguration()
+        {
+            Dictionary<String, String> 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
@@ -1,22 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
     <DebugType>None</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lamar" Version="12.0.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Lamar" Version="13.0.3" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj
@@ -1,20 +1,20 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
   <ItemGroup>
     <Folder Include="Manager\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
-    <PackageReference Include="MediatR" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2024.3.3" />
+    <PackageReference Include="ClientProxyBase" Version="2024.4.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 	
diff --git a/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj b/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+	  <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'">
diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
@@ -1,21 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	  <DebugType>None</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="Shared.EventStore" Version="2024.3.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Shared.EventStore" Version="2024.4.1" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Shared" Version="2024.3.3" />
-	<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
+	<PackageReference Include="Shared" Version="2024.4.1" />
+	<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
-	  <PackageReference Include="Shared" Version="2024.3.3" />
-	  <PackageReference Include="Shared.EventStore" Version="2024.3.3" />
+	  <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+	  <PackageReference Include="Shared" Version="2024.4.1" />
+	  <PackageReference Include="Shared.EventStore" Version="2024.4.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.IntegrationTesting" Version="2024.3.3" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2024.4.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
@@ -1,26 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2024.3.3" />
+    <PackageReference Include="ClientProxyBase" Version="2024.4.1" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
     <PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />
-    <PackageReference Include="SecurityService.Client" Version="2023.12.2-build58" />
-    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2023.12.2-build58" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2024.3.3" />
+    <PackageReference Include="SecurityService.Client" Version="2024.3.1" />
+    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.3.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2024.4.1" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/MessagingService.Models/MessagingService.Models.csproj b/MessagingService.Models/MessagingService.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	<DebugType>None</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
-    <PackageReference Include="Shared.EventStore" Version="2024.3.3" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+    <PackageReference Include="Shared.EventStore" Version="2024.4.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.Testing/MessagingService.Testing.csproj b/MessagingService.Testing/MessagingService.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
     <DebugType>None</DebugType>
   </PropertyGroup>
 
diff --git 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<String,String> GetStandardMemoryConfiguration()
+        {
+            Dictionary<String, String> configuration = new Dictionary<String, String>();
+
+            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
@@ -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<String, String> configuration = new Dictionary<String, String>();
+        private IConfigurationRoot SetupMemoryConfiguration(){
+            Dictionary<String, String> 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
diff --git a/MessagingService/Dockerfile b/MessagingService/Dockerfile
diff --git a/MessagingService/Dockerfilewindows b/MessagingService/Dockerfilewindows
diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj
diff --git a/MessagingService/Startup.cs b/MessagingService/Startup.cs
