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 new file mode 100644 index 0000000..c1bc24b --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,36 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/OrderTrackingApp.Api/Dockerfile b/OrderTrackingApp.Api/Dockerfile index f4fe51f..85667b6 100644 --- a/OrderTrackingApp.Api/Dockerfile +++ b/OrderTrackingApp.Api/Dockerfile @@ -1,10 +1,13 @@ -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 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.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/Dockerfile b/OrderTrackingApp.Blazor.Server/Dockerfile index 1e9cd1b..52f2bdb 100644 --- a/OrderTrackingApp.Blazor.Server/Dockerfile +++ b/OrderTrackingApp.Blazor.Server/Dockerfile @@ -1,9 +1,12 @@ -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/"] 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 @@ -19,7 +22,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.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/Dockerfile b/OrderTrackingApp.Consumer/Dockerfile index b4aa87a..9b2b11d 100644 --- a/OrderTrackingApp.Consumer/Dockerfile +++ b/OrderTrackingApp.Consumer/Dockerfile @@ -1,8 +1,11 @@ -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 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.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/Dockerfile b/OrderTrackingApp.MigrationRunner/Dockerfile index 1186c8e..bbfbb43 100644 --- a/OrderTrackingApp.MigrationRunner/Dockerfile +++ b/OrderTrackingApp.MigrationRunner/Dockerfile @@ -1,9 +1,12 @@ -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 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/"] 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..38307a0 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 - - -