Skip to content

Commit 624b0dc

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #449 from TransactionProcessing/task/#448_update_shared_nugets
Update dependencies and improve project structure
2 parents c2915b5 + a34248e commit 624b0dc

File tree

22 files changed

+267
-418
lines changed

22 files changed

+267
-418
lines changed

‎.github/workflows/nightlybuild.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
dotnet test "FileProcessor.BusinessLogic.Tests\FileProcessor.BusinessLogic.Tests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov1.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
3232
dotnet test "FileProcessor.FileAggregate.Tests\FileProcessor.FileAggregate.Tests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov2.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
3333
dotnet test "FileProcessor.FileImportLogAggregate.Tests\FileProcessor.FileImportLogAggregate.Tests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov3.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
34-
dotnet test "FileProcessor.DomainEvents.Tests\FileProcessor.DomainEvents.Tests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov4.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
3534
3635
- name: Setup Node.js for use with actions
3736
uses: actions/[email protected]
@@ -40,7 +39,7 @@ jobs:
4039
uses: codecov/codecov-action@v3
4140
with:
4241
token: ${{ secrets.CODECOV_TOKEN }}
43-
files: ./lcov1.info,./lcov2.info,./lcov3.info,./lcov4.info
42+
files: ./lcov1.info,./lcov2.info,./lcov3.info
4443

4544
- name: Build Docker Image
4645
run: docker build . --file FileProcessor/Dockerfile --tag fileprocessor:latest

‎.github/workflows/pullrequest.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
dotnet test "FileProcessor.BusinessLogic.Tests\FileProcessor.BusinessLogic.Tests.csproj"
3434
dotnet test "FileProcessor.FileAggregate.Tests\FileProcessor.FileAggregate.Tests.csproj"
3535
dotnet test "FileProcessor.FileImportLogAggregate.Tests\FileProcessor.FileImportLogAggregate.Tests.csproj"
36-
dotnet test "FileProcessor.DomainEvents.Tests\FileProcessor.DomainEvents.Tests.csproj"
3736
3837
- name: Build Docker Image
3938
run: docker build . --file FileProcessor/Dockerfile --tag fileprocessor:latest

‎FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13-
<PackageReference Include="Moq" Version="4.20.70" />
14-
<PackageReference Include="Shouldly" Version="4.2.1" />
15-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.2" />
16-
<PackageReference Include="xunit" Version="2.7.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.14" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Moq" Version="4.20.72" />
14+
<PackageReference Include="Shouldly" Version="4.3.0" />
15+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.11" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
21-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
21+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
910
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
10-
<PackageReference Include="Shared" Version="2025.1.2" />
11-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
12-
<PackageReference Include="MediatR" Version="12.2.0" />
13-
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
14-
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
15-
<PackageReference Include="TransactionProcessor.Client" Version="2025.1.5-build145" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
18-
<PackageReference Include="TransactionProcessor.Database" Version="2025.1.5-build145" />
11+
<PackageReference Include="Shared" Version="2025.3.1" />
12+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.3.1" />
13+
<PackageReference Include="MediatR" Version="12.4.1" />
14+
<PackageReference Include="Shared.EventStore" Version="2025.3.1" />
15+
<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
16+
<PackageReference Include="TransactionProcessor.Client" Version="2025.2.10" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
19+
<PackageReference Include="TransactionProcessor.Database" Version="2025.2.10" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

‎FileProcessor.Client/FileProcessor.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.1.2" />
10-
<PackageReference Include="Shared.Results" Version="2025.1.2" />
9+
<PackageReference Include="ClientProxyBase" Version="2025.3.1" />
10+
<PackageReference Include="Shared.Results" Version="2025.3.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎FileProcessor.DomainEvents.Tests/FileAggregateDomainEventTests.cs‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎FileProcessor.DomainEvents.Tests/FileImportLogAggregateDomainEventTests.cs‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎FileProcessor.DomainEvents.Tests/FileProcessor.DomainEvents.Tests.csproj‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.3.1" />
1010
</ItemGroup>
1111

1212
</Project>

‎FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="Shouldly" Version="4.2.1" />
12-
<PackageReference Include="xunit" Version="2.7.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
11+
<PackageReference Include="Shouldly" Version="4.3.0" />
12+
<PackageReference Include="xunit" Version="2.9.3" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
17-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
17+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

0 commit comments

Comments
 (0)