From 9b235e7f304651ce8c6e9d0f4f842de3021e4f42 Mon Sep 17 00:00:00 2001 From: Ian Nelson Date: Thu, 29 May 2025 13:48:51 +0100 Subject: [PATCH 1/3] refactor: rename common project to shared --- compose.yaml | 2 +- .../Configuration/AppConfiguration.cs | 2 - src/ServiceLayer.Mesh/DockerFile | 2 +- src/ServiceLayer.Mesh/Program.cs | 1 - .../ServiceLayer.Mesh.csproj | 2 +- .../Data/DesignTimeDbContextFactory.cs | 0 .../20250512113115_InitialCreate.Designer.cs | 0 .../20250512113115_InitialCreate.cs | 0 ...8_AddNbssAppointmentEventTable.Designer.cs | 0 ...0521094738_AddNbssAppointmentEventTable.cs | 0 ...0250527094020_ValidationErrors.Designer.cs | 0 .../20250527094020_ValidationErrors.cs | 0 .../ServiceLayerDbContextModelSnapshot.cs | 0 .../Data/Models/MeshFile.cs | 0 .../Data/Models/MeshFileStatus.cs | 0 .../Data/Models/MeshFileType.cs | 0 .../Data/Models/NbssAppointmentEvent.cs | 0 .../Data/ServiceLayerDbContext.cs | 0 .../Dockerfile.migrations | 6 +- .../EnvironmentVariables.cs | 2 - .../ServiceLayer.Shared.csproj} | 0 src/ServiceLayer.sln | 240 +++++++++--------- .../ServiceLayer.Shared.Tests.csproj} | 3 +- 23 files changed, 128 insertions(+), 132 deletions(-) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/DesignTimeDbContextFactory.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250512113115_InitialCreate.Designer.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250512113115_InitialCreate.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.Designer.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250527094020_ValidationErrors.Designer.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/20250527094020_ValidationErrors.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Migrations/ServiceLayerDbContextModelSnapshot.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Models/MeshFile.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Models/MeshFileStatus.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Models/MeshFileType.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/Models/NbssAppointmentEvent.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Data/ServiceLayerDbContext.cs (100%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/Dockerfile.migrations (86%) rename src/{ServiceLayer.Common => ServiceLayer.Shared}/EnvironmentVariables.cs (95%) rename src/{ServiceLayer.Common/ServiceLayer.Common.csproj => ServiceLayer.Shared/ServiceLayer.Shared.csproj} (100%) rename tests/{ServiceLayer.Common.Tests/ServiceLayer.Common.Tests.csproj => ServiceLayer.Shared.Tests/ServiceLayer.Shared.Tests.csproj} (85%) diff --git a/compose.yaml b/compose.yaml index ae785a8..e1daf96 100644 --- a/compose.yaml +++ b/compose.yaml @@ -118,7 +118,7 @@ services: container_name: db-migrations build: context: . - dockerfile: src/ServiceLayer.Common/Dockerfile.migrations + dockerfile: src/ServiceLayer.Shared/Dockerfile.migrations args: DatabaseConnectionString: "${DatabaseConnectionString}" depends_on: diff --git a/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs b/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs index fa9e348..15219c2 100644 --- a/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs +++ b/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs @@ -1,5 +1,3 @@ -using ServiceLayer.Common; - namespace ServiceLayer.Mesh.Configuration; public class AppConfiguration : diff --git a/src/ServiceLayer.Mesh/DockerFile b/src/ServiceLayer.Mesh/DockerFile index 2257ba7..32a4e97 100644 --- a/src/ServiceLayer.Mesh/DockerFile +++ b/src/ServiceLayer.Mesh/DockerFile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS installer-env WORKDIR /src/dotnet-function-app COPY ./dotnet-mesh-client/application/DotNetMeshClient/NHS.Mesh.Client/NHS.Mesh.Client.csproj ../dotnet-mesh-client/application/DotNetMeshClient/NHS.Mesh.Client/ -COPY ./ServiceLayer.Common/ServiceLayer.Common.csproj ../ServiceLayer.Common/ +COPY ./ServiceLayer.Shared/ServiceLayer.Shared.csproj ../ServiceLayer.Shared/ COPY ./ServiceLayer.Mesh/ServiceLayer.Mesh.csproj . RUN dotnet restore diff --git a/src/ServiceLayer.Mesh/Program.cs b/src/ServiceLayer.Mesh/Program.cs index 3c2c604..b3e116f 100644 --- a/src/ServiceLayer.Mesh/Program.cs +++ b/src/ServiceLayer.Mesh/Program.cs @@ -9,7 +9,6 @@ using ServiceLayer.Mesh.Messaging; using ServiceLayer.Data; using ServiceLayer.Mesh.Storage; -using ServiceLayer.Common; using ServiceLayer.Mesh.FileTypes.NbssAppointmentEvents; var host = new HostBuilder() diff --git a/src/ServiceLayer.Mesh/ServiceLayer.Mesh.csproj b/src/ServiceLayer.Mesh/ServiceLayer.Mesh.csproj index 2037bff..b832456 100644 --- a/src/ServiceLayer.Mesh/ServiceLayer.Mesh.csproj +++ b/src/ServiceLayer.Mesh/ServiceLayer.Mesh.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/ServiceLayer.Common/Data/DesignTimeDbContextFactory.cs b/src/ServiceLayer.Shared/Data/DesignTimeDbContextFactory.cs similarity index 100% rename from src/ServiceLayer.Common/Data/DesignTimeDbContextFactory.cs rename to src/ServiceLayer.Shared/Data/DesignTimeDbContextFactory.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250512113115_InitialCreate.Designer.cs b/src/ServiceLayer.Shared/Data/Migrations/20250512113115_InitialCreate.Designer.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250512113115_InitialCreate.Designer.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250512113115_InitialCreate.Designer.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250512113115_InitialCreate.cs b/src/ServiceLayer.Shared/Data/Migrations/20250512113115_InitialCreate.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250512113115_InitialCreate.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250512113115_InitialCreate.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.Designer.cs b/src/ServiceLayer.Shared/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.Designer.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.Designer.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.Designer.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.cs b/src/ServiceLayer.Shared/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250521094738_AddNbssAppointmentEventTable.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250527094020_ValidationErrors.Designer.cs b/src/ServiceLayer.Shared/Data/Migrations/20250527094020_ValidationErrors.Designer.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250527094020_ValidationErrors.Designer.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250527094020_ValidationErrors.Designer.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/20250527094020_ValidationErrors.cs b/src/ServiceLayer.Shared/Data/Migrations/20250527094020_ValidationErrors.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/20250527094020_ValidationErrors.cs rename to src/ServiceLayer.Shared/Data/Migrations/20250527094020_ValidationErrors.cs diff --git a/src/ServiceLayer.Common/Data/Migrations/ServiceLayerDbContextModelSnapshot.cs b/src/ServiceLayer.Shared/Data/Migrations/ServiceLayerDbContextModelSnapshot.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Migrations/ServiceLayerDbContextModelSnapshot.cs rename to src/ServiceLayer.Shared/Data/Migrations/ServiceLayerDbContextModelSnapshot.cs diff --git a/src/ServiceLayer.Common/Data/Models/MeshFile.cs b/src/ServiceLayer.Shared/Data/Models/MeshFile.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Models/MeshFile.cs rename to src/ServiceLayer.Shared/Data/Models/MeshFile.cs diff --git a/src/ServiceLayer.Common/Data/Models/MeshFileStatus.cs b/src/ServiceLayer.Shared/Data/Models/MeshFileStatus.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Models/MeshFileStatus.cs rename to src/ServiceLayer.Shared/Data/Models/MeshFileStatus.cs diff --git a/src/ServiceLayer.Common/Data/Models/MeshFileType.cs b/src/ServiceLayer.Shared/Data/Models/MeshFileType.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Models/MeshFileType.cs rename to src/ServiceLayer.Shared/Data/Models/MeshFileType.cs diff --git a/src/ServiceLayer.Common/Data/Models/NbssAppointmentEvent.cs b/src/ServiceLayer.Shared/Data/Models/NbssAppointmentEvent.cs similarity index 100% rename from src/ServiceLayer.Common/Data/Models/NbssAppointmentEvent.cs rename to src/ServiceLayer.Shared/Data/Models/NbssAppointmentEvent.cs diff --git a/src/ServiceLayer.Common/Data/ServiceLayerDbContext.cs b/src/ServiceLayer.Shared/Data/ServiceLayerDbContext.cs similarity index 100% rename from src/ServiceLayer.Common/Data/ServiceLayerDbContext.cs rename to src/ServiceLayer.Shared/Data/ServiceLayerDbContext.cs diff --git a/src/ServiceLayer.Common/Dockerfile.migrations b/src/ServiceLayer.Shared/Dockerfile.migrations similarity index 86% rename from src/ServiceLayer.Common/Dockerfile.migrations rename to src/ServiceLayer.Shared/Dockerfile.migrations index 0106461..34509cf 100644 --- a/src/ServiceLayer.Common/Dockerfile.migrations +++ b/src/ServiceLayer.Shared/Dockerfile.migrations @@ -12,8 +12,8 @@ RUN git submodule update --init --recursive ARG DatabaseConnectionString ENV DatabaseConnectionString=${DatabaseConnectionString} -RUN dotnet restore ./src/ServiceLayer.Common/ServiceLayer.Common.csproj && \ - dotnet build ./src/ServiceLayer.Common/ServiceLayer.Common.csproj && \ +RUN dotnet restore ./src/ServiceLayer.Shared/ServiceLayer.Shared.csproj && \ + dotnet build ./src/ServiceLayer.Shared/ServiceLayer.Shared.csproj && \ dotnet tool install dotnet-ef --tool-path /tools ENV PATH="/tools:$PATH" \ @@ -24,7 +24,7 @@ ENV PATH="/tools:$PATH" \ RUN mkdir -p /database && \ dotnet ef migrations script \ -o /database/migration.sql \ - --project ./src/ServiceLayer.Common/ + --project ./src/ServiceLayer.Shared/ # Stage 2: Runtime - Apply Migration and Seed Data FROM mcr.microsoft.com/mssql-tools:v1 AS migration-env diff --git a/src/ServiceLayer.Common/EnvironmentVariables.cs b/src/ServiceLayer.Shared/EnvironmentVariables.cs similarity index 95% rename from src/ServiceLayer.Common/EnvironmentVariables.cs rename to src/ServiceLayer.Shared/EnvironmentVariables.cs index 52a26c1..43b8c64 100644 --- a/src/ServiceLayer.Common/EnvironmentVariables.cs +++ b/src/ServiceLayer.Shared/EnvironmentVariables.cs @@ -1,5 +1,3 @@ -namespace ServiceLayer.Common; - public static class EnvironmentVariables { /// diff --git a/src/ServiceLayer.Common/ServiceLayer.Common.csproj b/src/ServiceLayer.Shared/ServiceLayer.Shared.csproj similarity index 100% rename from src/ServiceLayer.Common/ServiceLayer.Common.csproj rename to src/ServiceLayer.Shared/ServiceLayer.Shared.csproj diff --git a/src/ServiceLayer.sln b/src/ServiceLayer.sln index 14cb8a0..915a116 100644 --- a/src/ServiceLayer.sln +++ b/src/ServiceLayer.sln @@ -15,129 +15,129 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.Mesh.Tests", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHS.Mesh.Client", "dotnet-mesh-client\application\DotNetMeshClient\NHS.Mesh.Client\NHS.Mesh.Client.csproj", "{F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.Common", "ServiceLayer.Common\ServiceLayer.Common.csproj", "{B086BBF9-1A41-48C9-B019-F9C75CA634AF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.Shared", "ServiceLayer.Shared\ServiceLayer.Shared.csproj", "{B086BBF9-1A41-48C9-B019-F9C75CA634AF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.Common.Tests", "..\tests\ServiceLayer.Common.Tests\ServiceLayer.Common.Tests.csproj", "{9642EC3A-9BC3-4557-ACD1-807FE764D5F6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.Shared.Tests", "..\tests\ServiceLayer.Shared.Tests\ServiceLayer.Shared.Tests.csproj", "{9642EC3A-9BC3-4557-ACD1-807FE764D5F6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLayer.TestUtilities", "..\tests\ServiceLayer.TestUtilities\ServiceLayer.TestUtilities.csproj", "{43AE0301-63CA-4254-9580-4FB07C9D1920}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x64.ActiveCfg = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x64.Build.0 = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x86.ActiveCfg = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x86.Build.0 = Debug|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|Any CPU.Build.0 = Release|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x64.ActiveCfg = Release|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x64.Build.0 = Release|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x86.ActiveCfg = Release|Any CPU - {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x86.Build.0 = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x64.ActiveCfg = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x64.Build.0 = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x86.ActiveCfg = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x86.Build.0 = Debug|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|Any CPU.Build.0 = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x64.ActiveCfg = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x64.Build.0 = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x86.ActiveCfg = Release|Any CPU - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x86.Build.0 = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x64.ActiveCfg = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x64.Build.0 = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x86.ActiveCfg = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x86.Build.0 = Debug|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|Any CPU.Build.0 = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x64.ActiveCfg = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x64.Build.0 = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x86.ActiveCfg = Release|Any CPU - {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x86.Build.0 = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x64.Build.0 = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x86.Build.0 = Debug|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|Any CPU.Build.0 = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x64.ActiveCfg = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x64.Build.0 = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x86.ActiveCfg = Release|Any CPU - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x86.Build.0 = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x64.ActiveCfg = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x64.Build.0 = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x86.ActiveCfg = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x86.Build.0 = Debug|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|Any CPU.Build.0 = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x64.ActiveCfg = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x64.Build.0 = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x86.ActiveCfg = Release|Any CPU - {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x86.Build.0 = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x64.Build.0 = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x86.Build.0 = Debug|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|Any CPU.Build.0 = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x64.ActiveCfg = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x64.Build.0 = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x86.ActiveCfg = Release|Any CPU - {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x86.Build.0 = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x64.Build.0 = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x86.Build.0 = Debug|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|Any CPU.Build.0 = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x64.ActiveCfg = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x64.Build.0 = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x86.ActiveCfg = Release|Any CPU - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x86.Build.0 = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x64.ActiveCfg = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x64.Build.0 = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x86.ActiveCfg = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x86.Build.0 = Debug|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|Any CPU.Build.0 = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x64.ActiveCfg = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x64.Build.0 = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x86.ActiveCfg = Release|Any CPU - {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - {E5EF5B92-52DA-4EF3-956B-8AEE3D333428} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - {9642EC3A-9BC3-4557-ACD1-807FE764D5F6} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - {43AE0301-63CA-4254-9580-4FB07C9D1920} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {EEE06B13-019F-4618-A6EB-FD834B6EA7D7} - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x64.ActiveCfg = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x64.Build.0 = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x86.ActiveCfg = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Debug|x86.Build.0 = Debug|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|Any CPU.Build.0 = Release|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x64.ActiveCfg = Release|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x64.Build.0 = Release|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x86.ActiveCfg = Release|Any CPU + {B56B41FF-FA39-0FDE-E266-6EC09B268DFB}.Release|x86.Build.0 = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x64.ActiveCfg = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x64.Build.0 = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x86.ActiveCfg = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Debug|x86.Build.0 = Debug|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|Any CPU.Build.0 = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x64.ActiveCfg = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x64.Build.0 = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x86.ActiveCfg = Release|Any CPU + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72}.Release|x86.Build.0 = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x64.ActiveCfg = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x64.Build.0 = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x86.ActiveCfg = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Debug|x86.Build.0 = Debug|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|Any CPU.Build.0 = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x64.ActiveCfg = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x64.Build.0 = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x86.ActiveCfg = Release|Any CPU + {803E8A5E-A180-4799-8BE2-DD5BD3C34ED2}.Release|x86.Build.0 = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x64.ActiveCfg = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x64.Build.0 = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x86.ActiveCfg = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Debug|x86.Build.0 = Debug|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|Any CPU.Build.0 = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x64.ActiveCfg = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x64.Build.0 = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x86.ActiveCfg = Release|Any CPU + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428}.Release|x86.Build.0 = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x64.ActiveCfg = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x64.Build.0 = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x86.ActiveCfg = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Debug|x86.Build.0 = Debug|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|Any CPU.Build.0 = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x64.ActiveCfg = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x64.Build.0 = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x86.ActiveCfg = Release|Any CPU + {F373FEBA-AD0B-4E0B-BEE3-31D22C7AD43D}.Release|x86.Build.0 = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x64.ActiveCfg = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x64.Build.0 = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x86.ActiveCfg = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Debug|x86.Build.0 = Debug|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|Any CPU.Build.0 = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x64.ActiveCfg = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x64.Build.0 = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x86.ActiveCfg = Release|Any CPU + {B086BBF9-1A41-48C9-B019-F9C75CA634AF}.Release|x86.Build.0 = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x64.ActiveCfg = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x64.Build.0 = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Debug|x86.Build.0 = Debug|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|Any CPU.Build.0 = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x64.ActiveCfg = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x64.Build.0 = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x86.ActiveCfg = Release|Any CPU + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6}.Release|x86.Build.0 = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x64.ActiveCfg = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x64.Build.0 = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x86.ActiveCfg = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Debug|x86.Build.0 = Debug|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|Any CPU.Build.0 = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x64.ActiveCfg = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x64.Build.0 = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x86.ActiveCfg = Release|Any CPU + {43AE0301-63CA-4254-9580-4FB07C9D1920}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {BA052DAE-6FD1-483A-A0AF-DCBCF9E38C72} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {E5EF5B92-52DA-4EF3-956B-8AEE3D333428} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {9642EC3A-9BC3-4557-ACD1-807FE764D5F6} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + {43AE0301-63CA-4254-9580-4FB07C9D1920} = {0AB3BF05-4346-4AA6-1389-037BE0695223} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EEE06B13-019F-4618-A6EB-FD834B6EA7D7} + EndGlobalSection EndGlobal diff --git a/tests/ServiceLayer.Common.Tests/ServiceLayer.Common.Tests.csproj b/tests/ServiceLayer.Shared.Tests/ServiceLayer.Shared.Tests.csproj similarity index 85% rename from tests/ServiceLayer.Common.Tests/ServiceLayer.Common.Tests.csproj rename to tests/ServiceLayer.Shared.Tests/ServiceLayer.Shared.Tests.csproj index 7bb3d6b..bffe3c2 100644 --- a/tests/ServiceLayer.Common.Tests/ServiceLayer.Common.Tests.csproj +++ b/tests/ServiceLayer.Shared.Tests/ServiceLayer.Shared.Tests.csproj @@ -5,6 +5,7 @@ enable enable false + ServiceLayer.Tests @@ -23,7 +24,7 @@ - + From 9db70b61b5e4bf9e3aa09d0625efe05541afcd4c Mon Sep 17 00:00:00 2001 From: Ian Nelson Date: Thu, 29 May 2025 13:54:29 +0100 Subject: [PATCH 2/3] stop validating the format of sln files --- scripts/githooks/check-file-format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/githooks/check-file-format.sh b/scripts/githooks/check-file-format.sh index d7c9474..cb6dd55 100755 --- a/scripts/githooks/check-file-format.sh +++ b/scripts/githooks/check-file-format.sh @@ -101,7 +101,7 @@ function run-editorconfig-in-docker() { docker run --rm --platform linux/amd64 \ --volume "$PWD":/check \ "$image" \ - sh -c "ec --exclude '.git/' $dry_run_opt \$($filter) /dev/null" + sh -c "ec --exclude '.git/|.*\.sln$' $dry_run_opt \$($filter) /dev/null" } # ============================================================================== From 0f59feca8eb0d40573205b1ef1dabed5da71cbb1 Mon Sep 17 00:00:00 2001 From: Ian Nelson Date: Thu, 29 May 2025 14:24:54 +0100 Subject: [PATCH 3/3] Oops, missed this --- src/ServiceLayer.Mesh/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceLayer.Mesh/DockerFile b/src/ServiceLayer.Mesh/DockerFile index 32a4e97..22c4fc6 100644 --- a/src/ServiceLayer.Mesh/DockerFile +++ b/src/ServiceLayer.Mesh/DockerFile @@ -7,7 +7,7 @@ COPY ./ServiceLayer.Mesh/ServiceLayer.Mesh.csproj . RUN dotnet restore COPY ./dotnet-mesh-client/ ../dotnet-mesh-client/ -COPY ./ServiceLayer.Common/ ../ServiceLayer.Common/ +COPY ./ServiceLayer.Shared/ ../ServiceLayer.Shared/ COPY ./ServiceLayer.Mesh/ . RUN dotnet publish -c Release -o /home/site/wwwroot