Skip to content

shared nuget updates #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Nov 30, 2025
Merged

shared nuget updates #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d03e9
shared nuget updates
StuartFerguson Nov 29, 2025
df7236f
try fix failing tests
StuartFerguson Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.3.2" />
<PackageReference Include="Duende.IdentityServer.Storage" Version="7.3.2" />
<PackageReference Include="MediatR" Version="13.1.0" />
<PackageReference Include="MessagingService.Client" Version="2025.8.1" />
<PackageReference Include="MessagingService.Client" Version="2025.10.2-build106" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.10" />
<PackageReference Include="Shared" Version="2025.10.2" />
<PackageReference Include="Shared.Results" Version="2025.10.2" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Shared.Results" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions SecurityService.Client/SecurityService.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="Shared.Results" Version="2025.10.2" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Shared.Results" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SecurityService.Database/SecurityService.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared" Version="2025.10.2" />
<PackageReference Include="Shared" Version="2025.11.11" />
</ItemGroup>
<ItemGroup>
<Folder Include="DbContexts\" />
Expand Down
2 changes: 1 addition & 1 deletion SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
<PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
<!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
<!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions SecurityService.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
using Microsoft.EntityFrameworkCore;
using Shared.IntegrationTesting;

public class DockerHelper : Shared.IntegrationTesting.DockerHelper
public class DockerHelper : Shared.IntegrationTesting.TestContainers.DockerHelper
{
public ISecurityServiceClient SecurityServiceClient;

public async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)

Check warning on line 30 in SecurityService.IntegrationTests/Common/DockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test Pull Requests - Non UI 

'DockerHelper.StartContainersForScenarioRun(string, DockerServices)' hides inherited member 'DockerHelper.StartContainersForScenarioRun(string, DockerServices)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword.
{
await base.StartContainersForScenarioRun(scenarioName, dockerServices);

Expand All @@ -35,10 +35,10 @@
HttpClient httpClient = new HttpClient();
this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver,httpClient);

ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault;

Check warning on line 38 in SecurityService.IntegrationTests/Common/DockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test Pull Requests - Non UI 

'ServicePointManager' is obsolete: 'WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead. Settings on ServicePointManager no longer affect SslStream or HttpClient.' (https://aka.ms/dotnet-warnings/SYSLIB0014)
}

public override ContainerBuilder SetupSecurityServiceContainer()
/*public override DotNet.Testcontainers.Builders.ContainerBuilder SetupSecurityServiceContainer()
{

this.Trace("About to Start Security Container");
Expand Down Expand Up @@ -88,7 +88,7 @@

// Now build and return the container
return securityServiceContainer;
}
}*/

public override async Task CreateSubscriptions(){
// No subscriptions needed
Expand Down
2 changes: 0 additions & 2 deletions SecurityService.IntegrationTests/Common/GenericSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");
NlogLogger logger = new NlogLogger();
logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName);
LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);

Check warning on line 41 in SecurityService.IntegrationTests/Common/GenericSteps.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test Pull Requests - Non UI 

'LogManager.AddHiddenAssembly(Assembly)' is obsolete: 'Replaced by LogManager.Setup().SetupLogFactory(setup => setup.AddCallSiteHiddenAssembly(assembly)). Marked obsolete on NLog 5.3'

DockerServices dockerServices = DockerServices.SecurityService | DockerServices.SqlServer;

Expand All @@ -50,8 +50,6 @@

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

this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
Expand Down
25 changes: 0 additions & 25 deletions SecurityService.IntegrationTests/Common/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,6 @@ public class Setup
public static async Task GlobalSetup(DockerHelper dockerHelper)
{
ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
dockerHelper.SqlCredentials = Setup.SqlCredentials;
dockerHelper.DockerCredentials = Setup.DockerCredentials;
dockerHelper.SqlServerContainerName = "sharedsqlserver";

// Only one thread can execute this block at a time
lock (Setup.padLock)
{
Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");

dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
}
}

public static String GetConnectionString(String databaseName)
{
return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
}

public static String GetLocalConnectionString(String databaseName)
{
Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;

return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
}

}
}
2 changes: 1 addition & 1 deletion SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Reqnroll.NUnit" Version="3.2.0" />

<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />

Expand Down
Loading
Loading