From e3100b3ddb1a90c7587043d7feb23735462288b2 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 8 Jun 2026 10:57:27 +0100 Subject: [PATCH 1/3] .. --- Directory.Build.props | 5 ++ Directory.Packages.props | 62 +++++++++++++++++++ .../FileProcessor.BusinessLogic.Tests.csproj | 24 +++---- .../FileProcessor.BusinessLogic.csproj | 24 +++---- .../FileProcessor.Client.csproj | 4 +- FileProcessor.Client/FileProcessorClient.cs | 7 +-- .../FileProcessor.DataTransferObjects.csproj | 2 +- .../FileProcessor.File.DomainEvents.csproj | 2 +- .../FileProcessor.FileAggregate.Tests.csproj | 16 ++--- .../FileProcessor.FileAggregate.csproj | 8 +-- ...rocessor.FileImportLog.DomainEvents.csproj | 2 +- ...cessor.FileImportLogAggregate.Tests.csproj | 16 ++--- ...ileProcessor.FileImportLogAggregate.csproj | 6 +- ...rocessor.IntegrationTesting.Helpers.csproj | 4 +- .../FileProcessor.IntegrationTests.csproj | 38 ++++++------ .../FileProcessor.Testing.csproj | 1 + .../FileProcessor.Tests.csproj | 16 ++--- FileProcessor/FileProcessor.csproj | 50 +++++++-------- 18 files changed, 177 insertions(+), 110 deletions(-) create mode 100644 Directory.Build.props create mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..650ddde --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + true + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..9197b38 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj b/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj index a13e139..f155f35 100644 --- a/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj +++ b/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj @@ -7,21 +7,21 @@ - - - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj index b02f6d8..ba33f3d 100644 --- a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj +++ b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj @@ -5,18 +5,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/FileProcessor.Client/FileProcessor.Client.csproj b/FileProcessor.Client/FileProcessor.Client.csproj index 2a51991..07bb79d 100644 --- a/FileProcessor.Client/FileProcessor.Client.csproj +++ b/FileProcessor.Client/FileProcessor.Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/FileProcessor.Client/FileProcessorClient.cs b/FileProcessor.Client/FileProcessorClient.cs index 91d4477..1b8aa7d 100644 --- a/FileProcessor.Client/FileProcessorClient.cs +++ b/FileProcessor.Client/FileProcessorClient.cs @@ -36,11 +36,10 @@ public class FileProcessorClient : ClientProxyBase, IFileProcessorClient { /// The base address resolver. /// The HTTP client. public FileProcessorClient(Func baseAddressResolver, - HttpClient httpClient) : base(httpClient) { + HttpClient httpClient, + Func serialise, + Func deserialise) : base(httpClient, serialise, deserialise) { this.BaseAddressResolver = baseAddressResolver; - - // Add the API version header - this.HttpClient.DefaultRequestHeaders.Add("api-version", "1.0"); } #endregion diff --git a/FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj b/FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj index e650fe2..89657bc 100644 --- a/FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj +++ b/FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj @@ -6,7 +6,7 @@ - + diff --git a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj index 1ccadf9..84c006a 100644 --- a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj +++ b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj @@ -6,7 +6,7 @@ - + diff --git a/FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj b/FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj index 5c7b546..db8966f 100644 --- a/FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj +++ b/FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj @@ -7,17 +7,17 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj index 93e14a2..42434ff 100644 --- a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj +++ b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj index 18a32af..f00f6d1 100644 --- a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj +++ b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj @@ -6,7 +6,7 @@ - + diff --git a/FileProcessor.FileImportLogAggregate.Tests/FileProcessor.FileImportLogAggregate.Tests.csproj b/FileProcessor.FileImportLogAggregate.Tests/FileProcessor.FileImportLogAggregate.Tests.csproj index f1bc75a..cc39415 100644 --- a/FileProcessor.FileImportLogAggregate.Tests/FileProcessor.FileImportLogAggregate.Tests.csproj +++ b/FileProcessor.FileImportLogAggregate.Tests/FileProcessor.FileImportLogAggregate.Tests.csproj @@ -7,17 +7,17 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj index 5d8eb08..97b1c52 100644 --- a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj +++ b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj index d366ccb..26c2028 100644 --- a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj +++ b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj index 0a0506d..0087286 100644 --- a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj +++ b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj @@ -11,25 +11,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/FileProcessor.Testing/FileProcessor.Testing.csproj b/FileProcessor.Testing/FileProcessor.Testing.csproj index 1e294ef..2ebc9ad 100644 --- a/FileProcessor.Testing/FileProcessor.Testing.csproj +++ b/FileProcessor.Testing/FileProcessor.Testing.csproj @@ -3,6 +3,7 @@ net10.0 None + true diff --git a/FileProcessor.Tests/FileProcessor.Tests.csproj b/FileProcessor.Tests/FileProcessor.Tests.csproj index bf0bd2a..9af399b 100644 --- a/FileProcessor.Tests/FileProcessor.Tests.csproj +++ b/FileProcessor.Tests/FileProcessor.Tests.csproj @@ -7,17 +7,17 @@ - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/FileProcessor/FileProcessor.csproj b/FileProcessor/FileProcessor.csproj index d7661fe..2c6d60f 100644 --- a/FileProcessor/FileProcessor.csproj +++ b/FileProcessor/FileProcessor.csproj @@ -6,31 +6,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + From f70c58900131b012af0f0213451f4ca42e259b69 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 8 Jun 2026 11:50:51 +0100 Subject: [PATCH 2/3] final changes --- Directory.Packages.props | 2 +- .../DomainServiceHelperTests.cs | 2 +- .../FileProcessor.IntegrationTesting.Helpers.csproj | 1 + .../FileProcessor.IntegrationTests.csproj | 1 + FileProcessor.sln | 10 ++++++++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9197b38..9288f4e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -35,11 +35,11 @@ + - diff --git a/FileProcessor.BusinessLogic.Tests/DomainServiceHelperTests.cs b/FileProcessor.BusinessLogic.Tests/DomainServiceHelperTests.cs index bf857c2..23c49bb 100644 --- a/FileProcessor.BusinessLogic.Tests/DomainServiceHelperTests.cs +++ b/FileProcessor.BusinessLogic.Tests/DomainServiceHelperTests.cs @@ -1,7 +1,7 @@ using System; using FileProcessor.BusinessLogic.Services; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Identity.Client; + using Shared.EventStore.Helpers; using Shouldly; using SimpleResults; diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj index 26c2028..c7f0870 100644 --- a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj +++ b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj @@ -8,6 +8,7 @@ + diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj index 0087286..d30f2e0 100644 --- a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj +++ b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj @@ -26,6 +26,7 @@ + diff --git a/FileProcessor.sln b/FileProcessor.sln index c110cd5..df5f885 100644 --- a/FileProcessor.sln +++ b/FileProcessor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.33103.201 +# Visual Studio Version 18 +VisualStudioVersion = 18.6.11822.322 stable MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileProcessor", "FileProcessor\FileProcessor.csproj", "{012AC7D0-BEA2-4FDA-9D8C-FBFB0BDEEA6C}" EndProject @@ -39,6 +39,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileProcessor.Client", "Fil EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileProcessor.IntegrationTesting.Helpers", "FileProcessor.IntegrationTesting.Helpers\FileProcessor.IntegrationTesting.Helpers.csproj", "{89FF3F61-71B1-4494-9F33-E82F6984630E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ED47F158-720C-4D0B-B269-C272450D7FFA}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 068a30f78fe34546690a77fc14b4ca05eb337f87 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 8 Jun 2026 13:16:54 +0100 Subject: [PATCH 3/3] fix docker file --- FileProcessor/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FileProcessor/Dockerfile b/FileProcessor/Dockerfile index f917033..6597670 100644 --- a/FileProcessor/Dockerfile +++ b/FileProcessor/Dockerfile @@ -6,9 +6,10 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["FileProcessor/NuGet.Config", "."] -COPY ["FileProcessor/FileProcessor.csproj", "FileProcessor/"] -RUN dotnet restore "FileProcessor/FileProcessor.csproj" +COPY ["Directory.Packages.props", "."] +COPY ["Directory.Build.props", "."] COPY . . +RUN dotnet restore WORKDIR "/src/FileProcessor" RUN dotnet build "FileProcessor.csproj" -c Release -o /app/build