Skip to content

Commit a133125

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #1013 from TransactionProcessing/task/#1012_update_shared_nugets
shared nuget updates
2 parents b2bb458 + df7236f commit a133125

18 files changed

Lines changed: 83 additions & 165 deletions

File tree

‎SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.3.2" />
1010
<PackageReference Include="Duende.IdentityServer.Storage" Version="7.3.2" />
1111
<PackageReference Include="MediatR" Version="13.1.0" />
12-
<PackageReference Include="MessagingService.Client" Version="2025.8.1" />
12+
<PackageReference Include="MessagingService.Client" Version="2025.10.2-build106" />
1313
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
1414
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
1515
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
1818
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.10" />
19-
<PackageReference Include="Shared" Version="2025.10.2" />
20-
<PackageReference Include="Shared.Results" Version="2025.10.2" />
19+
<PackageReference Include="Shared" Version="2025.11.11" />
20+
<PackageReference Include="Shared.Results" Version="2025.11.11" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎SecurityService.Client/SecurityService.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
10-
<PackageReference Include="Shared.Results" Version="2025.10.2" />
9+
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
10+
<PackageReference Include="Shared.Results" Version="2025.11.11" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎SecurityService.Database/SecurityService.Database.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
2424
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
25-
<PackageReference Include="Shared" Version="2025.10.2" />
25+
<PackageReference Include="Shared" Version="2025.11.11" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<Folder Include="DbContexts\" />

‎SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
2020
<PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
2121
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
22-
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
22+
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
2323
<!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
2424
<!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2525
<PrivateAssets>all</PrivateAssets>

‎SecurityService.IntegrationTests/Common/DockerHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace SecurityService.IntergrationTests.Common
2323
using Microsoft.EntityFrameworkCore;
2424
using Shared.IntegrationTesting;
2525

26-
public class DockerHelper : Shared.IntegrationTesting.DockerHelper
26+
public class DockerHelper : Shared.IntegrationTesting.TestContainers.DockerHelper
2727
{
2828
public ISecurityServiceClient SecurityServiceClient;
2929

@@ -38,7 +38,7 @@ public async Task StartContainersForScenarioRun(String scenarioName, DockerServi
3838
ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault;
3939
}
4040

41-
public override ContainerBuilder SetupSecurityServiceContainer()
41+
/*public override DotNet.Testcontainers.Builders.ContainerBuilder SetupSecurityServiceContainer()
4242
{
4343
4444
this.Trace("About to Start Security Container");
@@ -88,7 +88,7 @@ public override ContainerBuilder SetupSecurityServiceContainer()
8888
8989
// Now build and return the container
9090
return securityServiceContainer;
91-
}
91+
}*/
9292

9393
public override async Task CreateSubscriptions(){
9494
// No subscriptions needed

‎SecurityService.IntegrationTests/Common/GenericSteps.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public async Task StartSystem()
5050

5151
await Setup.GlobalSetup(this.TestingContext.DockerHelper);
5252

53-
this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
54-
this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
5553
this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
5654
this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
5755
this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";

‎SecurityService.IntegrationTests/Common/Setup.cs‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,6 @@ public class Setup
2525
public static async Task GlobalSetup(DockerHelper dockerHelper)
2626
{
2727
ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
28-
dockerHelper.SqlCredentials = Setup.SqlCredentials;
29-
dockerHelper.DockerCredentials = Setup.DockerCredentials;
30-
dockerHelper.SqlServerContainerName = "sharedsqlserver";
31-
32-
// Only one thread can execute this block at a time
33-
lock (Setup.padLock)
34-
{
35-
Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");
36-
37-
dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
38-
Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
39-
}
40-
}
41-
42-
public static String GetConnectionString(String databaseName)
43-
{
44-
return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
4528
}
46-
47-
public static String GetLocalConnectionString(String databaseName)
48-
{
49-
Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;
50-
51-
return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
52-
}
53-
5429
}
5530
}

‎SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
2525
<PackageReference Include="Reqnroll.NUnit" Version="3.2.0" />
2626

27-
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
27+
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
2828
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
2929
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
3030

0 commit comments

Comments
 (0)