From cf102dea31da2ee3024f37183eb5ad242838551f Mon Sep 17 00:00:00 2001 From: Parag Naikade Date: Wed, 3 Dec 2025 13:14:21 +1100 Subject: [PATCH 1/4] First draft --- Directory.Packages.props | 31 +++++++++++++++++++ .../OrderTrackingApp.Api.csproj | 14 ++++----- ...erTrackingApp.Application.Contracts.csproj | 2 +- .../OrderTrackingApp.Application.csproj | 6 ++-- .../OrderTrackingApp.Blazor.Client.csproj | 4 +-- .../OrderTrackingApp.Blazor.Server.csproj | 4 +-- .../OrderTrackingApp.Consumer.csproj | 6 ++-- .../OrderTrackingApp.Domain.csproj | 4 +-- .../OrderTrackingApp.Infrastructure.csproj | 8 ++--- .../OrderTrackingApp.MigrationRunner.csproj | 6 ++-- .../OrderTrackingApp.Persistence.Tests.csproj | 10 +++--- .../OrderTrackingApp.Persistence.csproj | 10 +++--- .../OrderTrackingApp.ReadPersistence.csproj | 6 ++-- OrderTrackingApp.SignalR/Class1.cs | 7 ----- .../OrderTrackingApp.SignalR.csproj | 9 ------ 15 files changed, 71 insertions(+), 56 deletions(-) create mode 100644 Directory.Packages.props delete mode 100644 OrderTrackingApp.SignalR/Class1.cs delete mode 100644 OrderTrackingApp.SignalR/OrderTrackingApp.SignalR.csproj diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..3202ec9 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,31 @@ + + + true + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + \ No newline at end of file diff --git a/OrderTrackingApp.Api/OrderTrackingApp.Api.csproj b/OrderTrackingApp.Api/OrderTrackingApp.Api.csproj index a6aebfd..b4123b8 100644 --- a/OrderTrackingApp.Api/OrderTrackingApp.Api.csproj +++ b/OrderTrackingApp.Api/OrderTrackingApp.Api.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable fd420179-d5b0-44df-b29b-018fbfbdb9f1 @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj b/OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj index 85ef9ce..55356d8 100644 --- a/OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj +++ b/OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable diff --git a/OrderTrackingApp.Application/OrderTrackingApp.Application.csproj b/OrderTrackingApp.Application/OrderTrackingApp.Application.csproj index eab0a09..3e668a6 100644 --- a/OrderTrackingApp.Application/OrderTrackingApp.Application.csproj +++ b/OrderTrackingApp.Application/OrderTrackingApp.Application.csproj @@ -1,14 +1,14 @@  - net8.0 + net10.0 enable enable - - + + diff --git a/OrderTrackingApp.Blazor.Client/OrderTrackingApp.Blazor.Client.csproj b/OrderTrackingApp.Blazor.Client/OrderTrackingApp.Blazor.Client.csproj index 9f530b9..aaeb1dd 100644 --- a/OrderTrackingApp.Blazor.Client/OrderTrackingApp.Blazor.Client.csproj +++ b/OrderTrackingApp.Blazor.Client/OrderTrackingApp.Blazor.Client.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable true @@ -9,7 +9,7 @@ - + diff --git a/OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj b/OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj index 88d4203..96d03b4 100644 --- a/OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj +++ b/OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj @@ -1,13 +1,13 @@ - net8.0 + net10.0 enable enable - + diff --git a/OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj b/OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj index 4140bee..bf42411 100644 --- a/OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj +++ b/OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj @@ -1,15 +1,15 @@ - net8.0 + net10.0 enable enable dotnet-OrderTrackingApp.Consumer-4c972be3-521f-42ce-87d8-815ba1ccddd7 - - + + diff --git a/OrderTrackingApp.Domain/OrderTrackingApp.Domain.csproj b/OrderTrackingApp.Domain/OrderTrackingApp.Domain.csproj index db4c3f8..12bdd8c 100644 --- a/OrderTrackingApp.Domain/OrderTrackingApp.Domain.csproj +++ b/OrderTrackingApp.Domain/OrderTrackingApp.Domain.csproj @@ -1,13 +1,13 @@  - net8.0 + net10.0 enable enable - + diff --git a/OrderTrackingApp.Infrastructure/OrderTrackingApp.Infrastructure.csproj b/OrderTrackingApp.Infrastructure/OrderTrackingApp.Infrastructure.csproj index ed80f58..2007db0 100644 --- a/OrderTrackingApp.Infrastructure/OrderTrackingApp.Infrastructure.csproj +++ b/OrderTrackingApp.Infrastructure/OrderTrackingApp.Infrastructure.csproj @@ -1,15 +1,15 @@  - net8.0 + net10.0 enable enable - - - + + + diff --git a/OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj b/OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj index 117f12c..7ea555c 100644 --- a/OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj +++ b/OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable Linux @@ -19,8 +19,8 @@ - - + + diff --git a/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj b/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj index 034bcb2..f833e40 100644 --- a/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj +++ b/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/OrderTrackingApp.Persistence/OrderTrackingApp.Persistence.csproj b/OrderTrackingApp.Persistence/OrderTrackingApp.Persistence.csproj index edce8ab..3be187e 100644 --- a/OrderTrackingApp.Persistence/OrderTrackingApp.Persistence.csproj +++ b/OrderTrackingApp.Persistence/OrderTrackingApp.Persistence.csproj @@ -1,19 +1,19 @@  - net8.0 + net10.0 enable enable - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/OrderTrackingApp.ReadPersistence/OrderTrackingApp.ReadPersistence.csproj b/OrderTrackingApp.ReadPersistence/OrderTrackingApp.ReadPersistence.csproj index 527abbf..112c0f0 100644 --- a/OrderTrackingApp.ReadPersistence/OrderTrackingApp.ReadPersistence.csproj +++ b/OrderTrackingApp.ReadPersistence/OrderTrackingApp.ReadPersistence.csproj @@ -1,14 +1,14 @@  - net8.0 + net10.0 enable enable - - + + diff --git a/OrderTrackingApp.SignalR/Class1.cs b/OrderTrackingApp.SignalR/Class1.cs deleted file mode 100644 index 4247796..0000000 --- a/OrderTrackingApp.SignalR/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace OrderTrackingApp.SignalR -{ - public class Class1 - { - - } -} diff --git a/OrderTrackingApp.SignalR/OrderTrackingApp.SignalR.csproj b/OrderTrackingApp.SignalR/OrderTrackingApp.SignalR.csproj deleted file mode 100644 index fa71b7a..0000000 --- a/OrderTrackingApp.SignalR/OrderTrackingApp.SignalR.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net8.0 - enable - enable - - - From 13db42da00fffa911b79790f651baa6582f0658c Mon Sep 17 00:00:00 2001 From: Parag Naikade Date: Wed, 3 Dec 2025 14:21:39 +1100 Subject: [PATCH 2/4] Fix --- .vscode/launch.json | 12 ++++ .vscode/tasks.json | 12 ++++ Directory.Packages.props | 67 ++++++++++--------- .../OrderTrackingApp.Persistence.Tests.csproj | 2 +- 4 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..992dcd4 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,12 @@ +{ + "version": "0.2.0", + "configurations": [ + + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..b1c79f6 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,12 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "dotnet", + "task": "build", + "group": "build", + "problemMatcher": [], + "label": "dotnet: build" + } + ] +} \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 3202ec9..c1bc24b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,31 +1,36 @@ - - - true - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - \ No newline at end of file + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj b/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj index f833e40..38307a0 100644 --- a/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj +++ b/OrderTrackingApp.Persistence.Tests/OrderTrackingApp.Persistence.Tests.csproj @@ -10,7 +10,7 @@ - + From ef3f010479dc8978613d97803c15763d3e664415 Mon Sep 17 00:00:00 2001 From: Parag Naikade Date: Fri, 5 Dec 2025 14:24:28 +1100 Subject: [PATCH 3/4] updated dockerfiles --- OrderTrackingApp.Api/Dockerfile | 4 ++-- OrderTrackingApp.Blazor.Server/Dockerfile | 4 ++-- OrderTrackingApp.Consumer/Dockerfile | 4 ++-- OrderTrackingApp.MigrationRunner/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OrderTrackingApp.Api/Dockerfile b/OrderTrackingApp.Api/Dockerfile index f4fe51f..9098039 100644 --- a/OrderTrackingApp.Api/Dockerfile +++ b/OrderTrackingApp.Api/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base WORKDIR /app EXPOSE 8080 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["OrderTrackingApp.Api/OrderTrackingApp.Api.csproj", "OrderTrackingApp.Api/"] diff --git a/OrderTrackingApp.Blazor.Server/Dockerfile b/OrderTrackingApp.Blazor.Server/Dockerfile index 1e9cd1b..74599ef 100644 --- a/OrderTrackingApp.Blazor.Server/Dockerfile +++ b/OrderTrackingApp.Blazor.Server/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj", "OrderTrackingApp.Blazor.Server/"] @@ -19,7 +19,7 @@ RUN dotnet build "OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server. FROM build AS publish RUN dotnet publish "OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj" -c Release -o /app/publish --no-restore -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 WORKDIR /app COPY --from=publish /app/publish . diff --git a/OrderTrackingApp.Consumer/Dockerfile b/OrderTrackingApp.Consumer/Dockerfile index b4aa87a..730c15a 100644 --- a/OrderTrackingApp.Consumer/Dockerfile +++ b/OrderTrackingApp.Consumer/Dockerfile @@ -1,6 +1,6 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj", "OrderTrackingApp.Consumer/"] diff --git a/OrderTrackingApp.MigrationRunner/Dockerfile b/OrderTrackingApp.MigrationRunner/Dockerfile index 1186c8e..a7b2656 100644 --- a/OrderTrackingApp.MigrationRunner/Dockerfile +++ b/OrderTrackingApp.MigrationRunner/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:10.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj", "OrderTrackingApp.MigrationRunner/"] From ba0370c6a83000086e23cec20735a96c14f8a0a8 Mon Sep 17 00:00:00 2001 From: Parag Naikade Date: Fri, 5 Dec 2025 14:27:21 +1100 Subject: [PATCH 4/4] fix --- OrderTrackingApp.Api/Dockerfile | 3 +++ OrderTrackingApp.Blazor.Server/Dockerfile | 3 +++ OrderTrackingApp.Consumer/Dockerfile | 3 +++ OrderTrackingApp.MigrationRunner/Dockerfile | 3 +++ 4 files changed, 12 insertions(+) diff --git a/OrderTrackingApp.Api/Dockerfile b/OrderTrackingApp.Api/Dockerfile index 9098039..85667b6 100644 --- a/OrderTrackingApp.Api/Dockerfile +++ b/OrderTrackingApp.Api/Dockerfile @@ -5,6 +5,9 @@ EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src +# Copy root package props first +COPY ["Directory.Packages.props", "."] + COPY ["OrderTrackingApp.Api/OrderTrackingApp.Api.csproj", "OrderTrackingApp.Api/"] COPY ["OrderTrackingApp.Application/OrderTrackingApp.Application.csproj", "OrderTrackingApp.Application/"] COPY ["OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj", "OrderTrackingApp.Application.Contracts/"] diff --git a/OrderTrackingApp.Blazor.Server/Dockerfile b/OrderTrackingApp.Blazor.Server/Dockerfile index 74599ef..52f2bdb 100644 --- a/OrderTrackingApp.Blazor.Server/Dockerfile +++ b/OrderTrackingApp.Blazor.Server/Dockerfile @@ -4,6 +4,9 @@ WORKDIR /src COPY ["OrderTrackingApp.Blazor.Server/OrderTrackingApp.Blazor.Server.csproj", "OrderTrackingApp.Blazor.Server/"] COPY ["OrderTrackingApp.Blazor.Client/OrderTrackingApp.Blazor.Client.csproj", "OrderTrackingApp.Blazor.Client/"] +# Copy root package props first +COPY ["Directory.Packages.props", "."] + # Copy your root certificate into the container COPY nscacert.crt /usr/local/share/ca-certificates/nscacert.crt diff --git a/OrderTrackingApp.Consumer/Dockerfile b/OrderTrackingApp.Consumer/Dockerfile index 730c15a..9b2b11d 100644 --- a/OrderTrackingApp.Consumer/Dockerfile +++ b/OrderTrackingApp.Consumer/Dockerfile @@ -3,6 +3,9 @@ FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src +# Copy root package props first +COPY ["Directory.Packages.props", "."] + COPY ["OrderTrackingApp.Consumer/OrderTrackingApp.Consumer.csproj", "OrderTrackingApp.Consumer/"] COPY ["OrderTrackingApp.Application/OrderTrackingApp.Application.csproj", "OrderTrackingApp.Application/"] COPY ["OrderTrackingApp.Application.Contracts/OrderTrackingApp.Application.Contracts.csproj", "OrderTrackingApp.Application.Contracts/"] diff --git a/OrderTrackingApp.MigrationRunner/Dockerfile b/OrderTrackingApp.MigrationRunner/Dockerfile index a7b2656..bbfbb43 100644 --- a/OrderTrackingApp.MigrationRunner/Dockerfile +++ b/OrderTrackingApp.MigrationRunner/Dockerfile @@ -4,6 +4,9 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src +# Copy root package props first +COPY ["Directory.Packages.props", "."] + COPY ["OrderTrackingApp.MigrationRunner/OrderTrackingApp.MigrationRunner.csproj", "OrderTrackingApp.MigrationRunner/"] COPY ["OrderTrackingApp.Persistence/OrderTrackingApp.Persistence.csproj", "OrderTrackingApp.Persistence/"] COPY ["OrderTrackingApp.Application/OrderTrackingApp.Application.csproj", "OrderTrackingApp.Application/"]