try again :|

StuartFerguson · StuartFerguson · commit 01d5b9537995 · 2025-07-03T20:42:24.000+01:00
diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.6.1" />
+    <PackageReference Include="ClientProxyBase" Version="2025.6.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Shared.Results" Version="2025.6.1" />
+    <PackageReference Include="Shared.Results" Version="2025.6.2" />
   </ItemGroup>
 	
   <ItemGroup>
diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-    <PackageReference Include="Shared.EventStore" Version="2025.6.1" />
+    <PackageReference Include="Shared.EventStore" Version="2025.6.2" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Shared" Version="2025.6.1" />
-	<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.1" />
+	<PackageReference Include="Shared" Version="2025.6.2" />
+	<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
   </ItemGroup>
 
 </Project>
diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
 	  <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-	  <PackageReference Include="Shared" Version="2025.6.1" />
-	  <PackageReference Include="Shared.EventStore" Version="2025.6.1" />
+	  <PackageReference Include="Shared" Version="2025.6.2" />
+	  <PackageReference Include="Shared.EventStore" Version="2025.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs
@@ -50,7 +50,8 @@ public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper
         /// <param name="testingContext">The testing context.</param>
         public DockerHelper()
         {
-            this.TestingContext = new TestingContext();            
+            this.TestingContext = new TestingContext();     
+            this.TestId = Guid.NewGuid();
         }
 
         #endregion
@@ -70,15 +71,6 @@ public override async Task CreateSubscriptions(){
         /// </summary>
         /// <param name="scenarioName">Name of the scenario.</param>
         public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){
-
-            List<String> additionalVariables = new List<String>
-            {
-                this.SetConnectionString("ConnectionStrings:PersistedGrantDbContext", $"PersistedGrantStore-{this.TestId}", this.UseSecureSqlServerDatabase),
-                this.SetConnectionString("ConnectionStrings:ConfigurationDbContext", $"Configuration-{this.TestId}", this.UseSecureSqlServerDatabase),
-                this.SetConnectionString("ConnectionStrings:AuthenticationDbContext", $"Authentication-{this.TestId}", this.UseSecureSqlServerDatabase)
-            };
-            this.AdditionalVariables.Add(ContainerType.SecurityService, additionalVariables);
-
             await base.StartContainersForScenarioRun(scenarioName, dockerServices);
 
             // Setup the base address resolvers
diff --git a/MessagingService.IntegrationTests/Common/GenericSteps.cs b/MessagingService.IntegrationTests/Common/GenericSteps.cs
@@ -28,6 +28,7 @@ public GenericSteps(ScenarioContext scenarioContext,
         [BeforeScenario]
         public async Task StartSystem()
         {
+            
             // Initialise a logger
             String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");
             NlogLogger logger = new NlogLogger();
diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.6.1" />
+    <PackageReference Include="ClientProxyBase" Version="2025.6.2" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.1" />
@@ -16,7 +16,7 @@
     <PackageReference Include="Reqnroll.NUnit" Version="2.4.1" />
     <PackageReference Include="SecurityService.Client" Version="2025.5.1" />
     <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.5.1" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
@@ -30,15 +30,20 @@
     <ProjectReference Include="..\MessagingService.IntegrationTesting.Helpers\MessagingService.IntegrationTesting.Helpers.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!--<ItemGroup>
     <Compile Update="Email\SendEmail.feature.cs">
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Update="SMS\SendSMS.feature.cs">
       <DesignTime>True</DesignTime>
     </Compile>
+  </ItemGroup>-->
+  <ItemGroup>
+	  <None Update="**\*.feature">
+		  <Generator>ReqnrollSingleFileGenerator</Generator>
+		  <LastGenOutput>%(Filename).feature.cs</LastGenOutput>
+	  </None>
   </ItemGroup>
-
   <ItemGroup>
     <None Update="nlog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.1" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
   </ItemGroup>
 
 </Project>
diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-    <PackageReference Include="Shared.EventStore" Version="2025.6.1" />
+    <PackageReference Include="Shared.EventStore" Version="2025.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj
@@ -18,11 +18,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
-    <PackageReference Include="Shared" Version="2025.6.1" />
+    <PackageReference Include="Shared" Version="2025.6.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
-    <PackageReference Include="Shared.Results.Web" Version="2025.6.1" />
+    <PackageReference Include="Shared.Results.Web" Version="2025.6.2" />
     <PackageReference Include="SimpleResults.AspNetCore" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.2" />

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public GenericSteps(ScenarioContext scenarioContext,`
`28`	`28`	`[BeforeScenario]`
`29`	`29`	`public async Task StartSystem()`
`30`	`30`	`{`
	`31`	`+`
`31`	`32`	`// Initialise a logger`
`32`	`33`	`String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");`
`33`	`34`	`NlogLogger logger = new NlogLogger();`