Skip to content

shared nugets updated #350

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 1 commit into from
Nov 25, 2025
Merged

shared nugets updated #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions MessagingService.Client/MessagingService.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.11.3" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Shared.Results" Version="2025.11.3" />
<PackageReference Include="Shared.Results" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions MessagingService.Client/MessagingServiceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{
#region Fields

private readonly String BaseAddress;

Check warning on line 20 in MessagingService.Client/MessagingServiceClient.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

The field 'MessagingServiceClient.BaseAddress' is never used

Check warning on line 20 in MessagingService.Client/MessagingServiceClient.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

The field 'MessagingServiceClient.BaseAddress' is never used

Check warning on line 20 in MessagingService.Client/MessagingServiceClient.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

The field 'MessagingServiceClient.BaseAddress' is never used

private readonly Func<String, String> BaseAddressResolver;

Expand All @@ -43,7 +43,7 @@

try
{
Result<ResponseData<String>> result = await this.SendPostRequest<SendEmailRequest, ResponseData<String>>(requestUri, accessToken, sendEmailRequest, cancellationToken);
Result<ResponseData<String>> result = await this.SendHttpPostRequest<SendEmailRequest, ResponseData<String>>(requestUri, sendEmailRequest, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand All @@ -65,7 +65,7 @@
String requestUri = this.BuildRequestUrl("/api/email/resend");

try {
Result<ResponseData<String>> result = await this.SendPostRequest<ResendEmailRequest, ResponseData<String>>(requestUri, accessToken, resendEmailRequest, cancellationToken);
Result<ResponseData<String>> result = await this.SendHttpPostRequest<ResendEmailRequest, ResponseData<String>>(requestUri, resendEmailRequest, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand All @@ -88,7 +88,7 @@

try
{
Result<ResponseData<String>> result = await this.SendPostRequest<SendSMSRequest, ResponseData<String>>(requestUri, accessToken, sendSMSRequest, cancellationToken);
Result<ResponseData<String>> result = await this.SendHttpPostRequest<SendSMSRequest, ResponseData<String>>(requestUri, sendSMSRequest, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Shared.EventStore" Version="2025.11.3" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
Expand Down
4 changes: 2 additions & 2 deletions MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.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="Shared" Version="2025.11.3" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.3" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
<PackageReference Include="Shared" Version="2025.11.3" />
<PackageReference Include="Shared.EventStore" Version="2025.11.3" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...gingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.3" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace MessagingService.IntegrationTests.Common
///
/// </summary>
/// <seealso cref="Shared.IntegrationTesting.DockerHelper" />
public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper
public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper
{
#region Fields

Expand Down
4 changes: 1 addition & 3 deletions MessagingService.IntegrationTests/Common/GenericSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");
NlogLogger logger = new();
logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName);
LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);

Check warning on line 36 in MessagingService.IntegrationTests/Common/GenericSteps.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

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

Check warning on line 36 in MessagingService.IntegrationTests/Common/GenericSteps.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

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

Check warning on line 36 in MessagingService.IntegrationTests/Common/GenericSteps.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests 

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

DockerServices dockerServices = DockerServices.SqlServer | DockerServices.MessagingService | DockerServices.EventStore | DockerServices.SecurityService;

Expand All @@ -45,8 +45,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 All @@ -62,7 +60,7 @@

[AfterScenario]
public async Task StopSystem(){
DockerServices dockerSharedServices = DockerServices.SqlServer;
DockerServices dockerSharedServices = DockerServices.None;
this.TestingContext.Logger.LogInformation("About to Stop Containers for Scenario Run");
await this.TestingContext.DockerHelper.StopContainersForScenarioRun(dockerSharedServices).ConfigureAwait(false);
this.TestingContext.Logger.LogInformation("Containers for Scenario Run Stopped");
Expand Down
29 changes: 1 addition & 28 deletions MessagingService.IntegrationTests/Common/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,12 @@ namespace MessagingService.IntegrationTests.Common
[Binding]
public class Setup
{
public static IContainerService DatabaseServerContainer;
public static INetworkService DatabaseServerNetwork;
public static (String usename, String password) SqlCredentials = ("sa", "thisisalongpassword123!");
public static (String url, String username, String password) DockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland");
static object padLock = new object(); // Object to lock on


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}";
}
}
}
4 changes: 2 additions & 2 deletions MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.11.3" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="3.2.0" />
Expand All @@ -16,7 +16,7 @@
<PackageReference Include="Reqnroll.NUnit" Version="3.2.0" />
<PackageReference Include="SecurityService.Client" Version="2025.10.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.10.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.3" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.3" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
<PackageReference Include="Shared.EventStore" Version="2025.11.3" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions MessagingService/MessagingService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Shared" Version="2025.11.3" />
<PackageReference Include="Shared.Logger" Version="2025.11.3" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Shared.Logger" Version="2025.11.11" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.5" />
<PackageReference Include="Shared.Results.Web" Version="2025.11.3" />
<PackageReference Include="ClientProxyBase" Version="2025.11.3" />
<PackageReference Include="Shared.Results.Web" Version="2025.11.11" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="SimpleResults.AspNetCore" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.6" />
Expand Down
Loading