diff --git a/backend/Core/Musify.Application/Musify.Application.csproj b/backend/Core/Musify.Application/Application.csproj similarity index 82% rename from backend/Core/Musify.Application/Musify.Application.csproj rename to backend/Core/Musify.Application/Application.csproj index ce975d0..a424aa4 100644 --- a/backend/Core/Musify.Application/Musify.Application.csproj +++ b/backend/Core/Musify.Application/Application.csproj @@ -1,5 +1,10 @@ + + Musify.Application + Musify.Application + + @@ -19,7 +24,7 @@ - + diff --git a/backend/Core/Musify.Domain/Domain.csproj b/backend/Core/Musify.Domain/Domain.csproj new file mode 100644 index 0000000..7704456 --- /dev/null +++ b/backend/Core/Musify.Domain/Domain.csproj @@ -0,0 +1,8 @@ + + + + Musify.Domain + Musify.Domain + + + diff --git a/backend/Core/Musify.Domain/Musify.Domain.csproj b/backend/Core/Musify.Domain/Musify.Domain.csproj deleted file mode 100644 index 61718a1..0000000 --- a/backend/Core/Musify.Domain/Musify.Domain.csproj +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/backend/Core/Musify.Infrastructure/Musify.Infrastructure.csproj b/backend/Core/Musify.Infrastructure/Infrastructure.csproj similarity index 89% rename from backend/Core/Musify.Infrastructure/Musify.Infrastructure.csproj rename to backend/Core/Musify.Infrastructure/Infrastructure.csproj index a221580..f5e3b78 100644 --- a/backend/Core/Musify.Infrastructure/Musify.Infrastructure.csproj +++ b/backend/Core/Musify.Infrastructure/Infrastructure.csproj @@ -1,6 +1,8 @@ + Musify.Infrastructure + Musify.Infrastructure 07d419fc-9ade-471a-bc0e-aebece785b30 @@ -35,8 +37,8 @@ - - + + diff --git a/backend/Hosts/Musify.Api/Musify.Api.csproj b/backend/Hosts/Musify.Api/Api.csproj similarity index 86% rename from backend/Hosts/Musify.Api/Musify.Api.csproj rename to backend/Hosts/Musify.Api/Api.csproj index 6493230..b825241 100644 --- a/backend/Hosts/Musify.Api/Musify.Api.csproj +++ b/backend/Hosts/Musify.Api/Api.csproj @@ -1,6 +1,8 @@ + Musify.Api + Musify.Api 1c3fa41c-6f07-433b-af79-1f67fad338fd @@ -31,9 +33,9 @@ - - - + + + diff --git a/backend/Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj b/backend/Hosts/Musify.StreamingGateway/StreamingGateway.csproj similarity index 73% rename from backend/Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj rename to backend/Hosts/Musify.StreamingGateway/StreamingGateway.csproj index 93ec808..3a33033 100644 --- a/backend/Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj +++ b/backend/Hosts/Musify.StreamingGateway/StreamingGateway.csproj @@ -1,6 +1,8 @@ + Musify.StreamingGateway + Musify.StreamingGateway media-gateway-2f1c9b6a-7d3e-4c0a-9a21-0b8e5d4c3f10 diff --git a/backend/Hosts/Musify.Worker/Musify.Worker.csproj b/backend/Hosts/Musify.Worker/Worker.csproj similarity index 76% rename from backend/Hosts/Musify.Worker/Musify.Worker.csproj rename to backend/Hosts/Musify.Worker/Worker.csproj index 04e296f..ff6b88d 100644 --- a/backend/Hosts/Musify.Worker/Musify.Worker.csproj +++ b/backend/Hosts/Musify.Worker/Worker.csproj @@ -1,6 +1,8 @@ + Musify.Worker + Musify.Worker dotnet-PictureWorker-1dfff89f-0602-41b7-8eaf-4da2c3358789 @@ -18,9 +20,9 @@ - - - + + + diff --git a/backend/Musify.Api.Dockerfile b/backend/Musify.Api.Dockerfile index 1ffa032..f27651e 100644 --- a/backend/Musify.Api.Dockerfile +++ b/backend/Musify.Api.Dockerfile @@ -4,14 +4,14 @@ WORKDIR /src # Restore: copy central config + csproj files first to cache the layer. COPY Directory.Build.props Directory.Packages.props nuget.config ./ -COPY Core/Musify.Domain/Musify.Domain.csproj Core/Musify.Domain/ -COPY Core/Musify.Application/Musify.Application.csproj Core/Musify.Application/ -COPY Core/Musify.Infrastructure/Musify.Infrastructure.csproj Core/Musify.Infrastructure/ -COPY Hosts/Musify.Api/Musify.Api.csproj Hosts/Musify.Api/ -RUN dotnet restore Hosts/Musify.Api/Musify.Api.csproj +COPY Core/Musify.Domain/Domain.csproj Core/Musify.Domain/ +COPY Core/Musify.Application/Application.csproj Core/Musify.Application/ +COPY Core/Musify.Infrastructure/Infrastructure.csproj Core/Musify.Infrastructure/ +COPY Hosts/Musify.Api/Api.csproj Hosts/Musify.Api/ +RUN dotnet restore Hosts/Musify.Api/Api.csproj COPY . . -RUN dotnet publish Hosts/Musify.Api/Musify.Api.csproj -c Release -o /app --no-restore +RUN dotnet publish Hosts/Musify.Api/Api.csproj -c Release -o /app --no-restore # Config files are AppSettings*.json (PascalCase); on case-sensitive Linux the host # looks for appsettings*.json. Add lowercase copies so they get loaded. RUN cp /app/AppSettings.json /app/appsettings.json \ diff --git a/backend/Musify.Migrator.Dockerfile b/backend/Musify.Migrator.Dockerfile index 64fba65..d7a1c70 100644 --- a/backend/Musify.Migrator.Dockerfile +++ b/backend/Musify.Migrator.Dockerfile @@ -9,10 +9,10 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 WORKDIR /src COPY Directory.Build.props Directory.Packages.props nuget.config ./ -COPY Core/Musify.Domain/Musify.Domain.csproj Core/Musify.Domain/ -COPY Core/Musify.Application/Musify.Application.csproj Core/Musify.Application/ -COPY Core/Musify.Infrastructure/Musify.Infrastructure.csproj Core/Musify.Infrastructure/ -RUN dotnet restore Core/Musify.Infrastructure/Musify.Infrastructure.csproj +COPY Core/Musify.Domain/Domain.csproj Core/Musify.Domain/ +COPY Core/Musify.Application/Application.csproj Core/Musify.Application/ +COPY Core/Musify.Infrastructure/Infrastructure.csproj Core/Musify.Infrastructure/ +RUN dotnet restore Core/Musify.Infrastructure/Infrastructure.csproj COPY Core/Musify.Domain Core/Musify.Domain/ COPY Core/Musify.Application Core/Musify.Application/ diff --git a/backend/Musify.StreamingGateway.Dockerfile b/backend/Musify.StreamingGateway.Dockerfile index 5a48d51..9da3ab5 100644 --- a/backend/Musify.StreamingGateway.Dockerfile +++ b/backend/Musify.StreamingGateway.Dockerfile @@ -3,11 +3,11 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY Directory.Build.props Directory.Packages.props nuget.config ./ -COPY Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj Hosts/Musify.StreamingGateway/ -RUN dotnet restore Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj +COPY Hosts/Musify.StreamingGateway/StreamingGateway.csproj Hosts/Musify.StreamingGateway/ +RUN dotnet restore Hosts/Musify.StreamingGateway/StreamingGateway.csproj COPY . . -RUN dotnet publish Hosts/Musify.StreamingGateway/Musify.StreamingGateway.csproj -c Release -o /app --no-restore +RUN dotnet publish Hosts/Musify.StreamingGateway/StreamingGateway.csproj -c Release -o /app --no-restore FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime WORKDIR /app diff --git a/backend/Musify.Worker.Dockerfile b/backend/Musify.Worker.Dockerfile index 5b91060..c21c71f 100644 --- a/backend/Musify.Worker.Dockerfile +++ b/backend/Musify.Worker.Dockerfile @@ -3,14 +3,14 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY Directory.Build.props Directory.Packages.props nuget.config ./ -COPY Core/Musify.Domain/Musify.Domain.csproj Core/Musify.Domain/ -COPY Core/Musify.Application/Musify.Application.csproj Core/Musify.Application/ -COPY Core/Musify.Infrastructure/Musify.Infrastructure.csproj Core/Musify.Infrastructure/ -COPY Hosts/Musify.Worker/Musify.Worker.csproj Hosts/Musify.Worker/ -RUN dotnet restore Hosts/Musify.Worker/Musify.Worker.csproj +COPY Core/Musify.Domain/Domain.csproj Core/Musify.Domain/ +COPY Core/Musify.Application/Application.csproj Core/Musify.Application/ +COPY Core/Musify.Infrastructure/Infrastructure.csproj Core/Musify.Infrastructure/ +COPY Hosts/Musify.Worker/Worker.csproj Hosts/Musify.Worker/ +RUN dotnet restore Hosts/Musify.Worker/Worker.csproj COPY . . -RUN dotnet publish Hosts/Musify.Worker/Musify.Worker.csproj -c Release -o /app --no-restore +RUN dotnet publish Hosts/Musify.Worker/Worker.csproj -c Release -o /app --no-restore # AppSettings*.json (PascalCase) -> lowercase copies for case-sensitive Linux. RUN cp /app/AppSettings.json /app/appsettings.json \ && cp /app/AppSettings.Development.json /app/appsettings.Development.json diff --git a/backend/Musify.slnx b/backend/Musify.slnx index 0d70203..db6c6b3 100644 --- a/backend/Musify.slnx +++ b/backend/Musify.slnx @@ -1,19 +1,19 @@ - - - + + + - - - + + + - - - - - + + + + + diff --git a/backend/Tests/Musify.Api.Tests/Musify.Api.Tests.csproj b/backend/Tests/Musify.Api.Tests/Api.Tests.csproj similarity index 74% rename from backend/Tests/Musify.Api.Tests/Musify.Api.Tests.csproj rename to backend/Tests/Musify.Api.Tests/Api.Tests.csproj index 79099e8..39b562c 100644 --- a/backend/Tests/Musify.Api.Tests/Musify.Api.Tests.csproj +++ b/backend/Tests/Musify.Api.Tests/Api.Tests.csproj @@ -1,6 +1,8 @@ + Musify.Api.Tests + Musify.Api.Tests false true Exe @@ -23,10 +25,10 @@ - - - - + + + + diff --git a/backend/Tests/Musify.Application.Tests/Musify.Application.Tests.csproj b/backend/Tests/Musify.Application.Tests/Application.Tests.csproj similarity index 78% rename from backend/Tests/Musify.Application.Tests/Musify.Application.Tests.csproj rename to backend/Tests/Musify.Application.Tests/Application.Tests.csproj index 573990f..d6f7af5 100644 --- a/backend/Tests/Musify.Application.Tests/Musify.Application.Tests.csproj +++ b/backend/Tests/Musify.Application.Tests/Application.Tests.csproj @@ -1,6 +1,8 @@ + Musify.Application.Tests + Musify.Application.Tests false true Exe @@ -23,8 +25,8 @@ - - + + diff --git a/backend/Tests/Musify.Domain.Tests/Musify.Domain.Tests.csproj b/backend/Tests/Musify.Domain.Tests/Domain.Tests.csproj similarity index 81% rename from backend/Tests/Musify.Domain.Tests/Musify.Domain.Tests.csproj rename to backend/Tests/Musify.Domain.Tests/Domain.Tests.csproj index b92870e..0562fae 100644 --- a/backend/Tests/Musify.Domain.Tests/Musify.Domain.Tests.csproj +++ b/backend/Tests/Musify.Domain.Tests/Domain.Tests.csproj @@ -1,6 +1,8 @@ + Musify.Domain.Tests + Musify.Domain.Tests false true Exe @@ -20,7 +22,7 @@ - + diff --git a/backend/Tests/Musify.Infrastructure.Tests/Musify.Infrastructure.Tests.csproj b/backend/Tests/Musify.Infrastructure.Tests/Infrastructure.Tests.csproj similarity index 81% rename from backend/Tests/Musify.Infrastructure.Tests/Musify.Infrastructure.Tests.csproj rename to backend/Tests/Musify.Infrastructure.Tests/Infrastructure.Tests.csproj index baa8c29..613e7eb 100644 --- a/backend/Tests/Musify.Infrastructure.Tests/Musify.Infrastructure.Tests.csproj +++ b/backend/Tests/Musify.Infrastructure.Tests/Infrastructure.Tests.csproj @@ -1,6 +1,8 @@ + Musify.Infrastructure.Tests + Musify.Infrastructure.Tests false true Exe @@ -27,9 +29,9 @@ - - - + + + diff --git a/backend/Tests/Musify.StreamingGateway.Tests/Musify.StreamingGateway.Tests.csproj b/backend/Tests/Musify.StreamingGateway.Tests/StreamingGateway.Tests.csproj similarity index 84% rename from backend/Tests/Musify.StreamingGateway.Tests/Musify.StreamingGateway.Tests.csproj rename to backend/Tests/Musify.StreamingGateway.Tests/StreamingGateway.Tests.csproj index dd95aac..a761f3f 100644 --- a/backend/Tests/Musify.StreamingGateway.Tests/Musify.StreamingGateway.Tests.csproj +++ b/backend/Tests/Musify.StreamingGateway.Tests/StreamingGateway.Tests.csproj @@ -1,6 +1,8 @@ + Musify.StreamingGateway.Tests + Musify.StreamingGateway.Tests false true Exe @@ -20,7 +22,7 @@ - +