Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .github/workflows/createrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/nightlybuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ jobs:

steps:
- uses: actions/checkout@v2.3.4


- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Set Up Variables
run: echo "action_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v2.3.4

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pushtomaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
with:
fetch-depth: 0

- name: Install NET 9
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: '9.0.x'

- name: Restore Nuget Packages
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lamar" Version="14.0.1" />
<PackageReference Include="Lamar" Version="15.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="SimpleResults" Version="3.0.1" />
<PackageReference Include="SimpleResults" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 4 additions & 9 deletions MessagingService.Client/MessagingService.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.3.1" />
<PackageReference Include="ClientProxyBase" Version="2025.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shared.Results" Version="2025.6.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MessagingService.DataTransferObjects\MessagingService.DataTransferObjects.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Shared.EventStore">
<Version>2025.3.1</Version>
</PackageReference>
</ItemGroup>


<Target Name="IncludeP2PAssets">
<ItemGroup>
<BuildOutputInPackage Include="$(OutputPath)MessagingService.DataTransferObjects.dll" />
Expand Down
3 changes: 1 addition & 2 deletions MessagingService.Client/MessagingServiceClient.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Shared.EventStore.Aggregate;
using Shared.Results;
using Shared.Results;

namespace MessagingService.Client
{
Expand All @@ -26,7 +25,7 @@
/// <summary>
/// The base address
/// </summary>
private readonly String BaseAddress;

Check warning on line 28 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 28 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

/// <summary>
/// The base address resolver
Expand Down Expand Up @@ -63,7 +62,7 @@
SendEmailRequest sendEmailRequest,
CancellationToken cancellationToken)
{
SendEmailResponse response = null;

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

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests

The variable 'response' is assigned but its value is never used

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

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests

The variable 'response' is assigned but its value is never used

String requestUri = this.BuildRequestUrl("/api/email/");

Expand Down Expand Up @@ -139,7 +138,7 @@
SendSMSRequest sendSMSRequest,
CancellationToken cancellationToken)
{
SendSMSResponse response = null;

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

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests

The variable 'response' is assigned but its value is never used

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

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests

The variable 'response' is assigned but its value is never used

String requestUri = this.BuildRequestUrl("/api/sms/");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Shared.EventStore" Version="2025.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Shared.EventStore" Version="2025.6.1" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DebugType>None</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared" Version="2025.3.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.3.1" />
<PackageReference Include="Shared" Version="2025.6.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.70.0" />
<PackageReference Include="Shared" Version="2025.3.1" />
<PackageReference Include="Shared.EventStore" Version="2025.3.1" />
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
<PackageReference Include="Shared" Version="2025.6.1" />
<PackageReference Include="Shared.EventStore" Version="2025.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.IntegrationTesting" Version="2025.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down
64 changes: 42 additions & 22 deletions MessagingService.IntegrationTests/Email/SendEmail.feature.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.3.1" />
<PackageReference Include="ClientProxyBase" Version="2025.6.1" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.1" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="Reqnroll" Version="2.4.0" />
<PackageReference Include="Reqnroll.NUnit" Version="2.4.0" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.1.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.3.1" />
<PackageReference Include="Reqnroll" Version="2.4.1" />
<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="Shouldly" Version="4.3.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
Expand Down
Loading
Loading