From e9e018998d1b2c9ec7b3d3a58d1a065371c6e063 Mon Sep 17 00:00:00 2001 From: Gary Woodfine Date: Wed, 17 Jan 2024 10:56:39 +0000 Subject: [PATCH] Refactor project structure and add package references The commit includes several significant changes. The project structure has been altered, mainly renaming 'Models' to 'Entities' and reshuffling their dependencies in `ApiSolution.sln`. New package references have been added in multiple `Common.csproj` files. A pull request template file has also been introduced. Additionally, modifications have been made in several `Directory.Build.props` files and GitVersion configuration has been updated. --- .github/PULL_REQUEST_TEMPLATE.md | 12 ++++++++++++ GitVersion.yml | 1 + src/Solution-MSSQL/ApiSolution.sln | 9 ++++++--- src/Solution-MSSQL/src/Common/Common.csproj | 4 ++++ .../src/Database/Database/Database.csproj | 6 +----- .../src/Database/Database/Directory.Build.props | 10 +--------- .../src/Database/Directory.Build.props | 12 ++++++++++++ .../{Models/Data => Entities}/ApiSolution.cs | 2 ++ .../src/Database/Entities/Directory.Build.props | 3 +++ .../Models.csproj => Entities/Entities.csproj} | 3 --- src/Solution-Postgre/src/Common/Common.csproj | 5 ++++- src/Solution/src/Common/Common.csproj | 6 +++++- 12 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 src/Solution-MSSQL/src/Database/Directory.Build.props rename src/Solution-MSSQL/src/Database/{Models/Data => Entities}/ApiSolution.cs (57%) create mode 100644 src/Solution-MSSQL/src/Database/Entities/Directory.Build.props rename src/Solution-MSSQL/src/Database/{Models/Models.csproj => Entities/Entities.csproj} (54%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..d67e5a9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,12 @@ +## What type of PR is this? (check all applicable) + +- [ ] Refactor +- [ ] Feature +- [ ] Enhancement +- [ ] Bug Fix +- [ ] Optimization +- [ ] Documentation Update + +## Overview: +[comment]: # (Provide a brief outline and explanation of what this PR contains answering common questions i.e. Why is this change required? What problem does it solve? What prompted this change? How does it provide benefits? What would the benefits of the change be? ) + diff --git a/GitVersion.yml b/GitVersion.yml index 681fe4e..68b6473 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,5 @@ mode: Mainline +commit-message-incrementing: MergeMessageOnly branches: main: tag: '' diff --git a/src/Solution-MSSQL/ApiSolution.sln b/src/Solution-MSSQL/ApiSolution.sln index 1bce25a..8a2c5cd 100644 --- a/src/Solution-MSSQL/ApiSolution.sln +++ b/src/Solution-MSSQL/ApiSolution.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32421.90 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj", "{DD2EE8D9-E994-4C46-AEA1-5595FF41D1CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "src\Database\Models\Models.csproj", "{4F6BB803-678F-47EF-9625-C43CBB4E9862}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entities", "src\Database\Entities\Entities.csproj", "{4F6BB803-678F-47EF-9625-C43CBB4E9862}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Database", "src\Database\Database\Database.csproj", "{5C30C594-8D61-4CF5-97D1-CA7E0C4B412D}" EndProject @@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Domain", "src\Domain\Domain EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "src\Common\Common.csproj", "{894BD25A-1019-4102-B58E-72E082221215}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Db", "Db", "{7FDC3DCE-1A94-47EA-93F2-5405AF680DB2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,12 +63,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {DD2EE8D9-E994-4C46-AEA1-5595FF41D1CB} = {3334D2B1-E580-409A-BFC2-61D17322E777} - {4F6BB803-678F-47EF-9625-C43CBB4E9862} = {3334D2B1-E580-409A-BFC2-61D17322E777} - {5C30C594-8D61-4CF5-97D1-CA7E0C4B412D} = {3334D2B1-E580-409A-BFC2-61D17322E777} {F86F0A39-8E33-4B49-9920-9F8667109913} = {DE42ED16-713D-4879-B493-55DB00214053} {C9C9A09B-C9A4-4251-8CD7-B382D84A8AA5} = {DE42ED16-713D-4879-B493-55DB00214053} {554CAEFB-DF6E-4D95-A6B1-5318B45244BE} = {3334D2B1-E580-409A-BFC2-61D17322E777} {894BD25A-1019-4102-B58E-72E082221215} = {3334D2B1-E580-409A-BFC2-61D17322E777} + {7FDC3DCE-1A94-47EA-93F2-5405AF680DB2} = {3334D2B1-E580-409A-BFC2-61D17322E777} + {5C30C594-8D61-4CF5-97D1-CA7E0C4B412D} = {7FDC3DCE-1A94-47EA-93F2-5405AF680DB2} + {4F6BB803-678F-47EF-9625-C43CBB4E9862} = {7FDC3DCE-1A94-47EA-93F2-5405AF680DB2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9604DC3D-CE77-42D3-A98A-3515BA0B24DD} diff --git a/src/Solution-MSSQL/src/Common/Common.csproj b/src/Solution-MSSQL/src/Common/Common.csproj index 3d51fd0..fe873f6 100644 --- a/src/Solution-MSSQL/src/Common/Common.csproj +++ b/src/Solution-MSSQL/src/Common/Common.csproj @@ -1,5 +1,9 @@ + + + + diff --git a/src/Solution-MSSQL/src/Database/Database/Database.csproj b/src/Solution-MSSQL/src/Database/Database/Database.csproj index 711fa49..778d6ca 100644 --- a/src/Solution-MSSQL/src/Database/Database/Database.csproj +++ b/src/Solution-MSSQL/src/Database/Database/Database.csproj @@ -1,10 +1,6 @@  - - - - - + diff --git a/src/Solution-MSSQL/src/Database/Database/Directory.Build.props b/src/Solution-MSSQL/src/Database/Database/Directory.Build.props index 946f794..8fcb2f1 100644 --- a/src/Solution-MSSQL/src/Database/Database/Directory.Build.props +++ b/src/Solution-MSSQL/src/Database/Database/Directory.Build.props @@ -1,11 +1,3 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/Solution-MSSQL/src/Database/Directory.Build.props b/src/Solution-MSSQL/src/Database/Directory.Build.props new file mode 100644 index 0000000..69f9880 --- /dev/null +++ b/src/Solution-MSSQL/src/Database/Directory.Build.props @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/Solution-MSSQL/src/Database/Models/Data/ApiSolution.cs b/src/Solution-MSSQL/src/Database/Entities/ApiSolution.cs similarity index 57% rename from src/Solution-MSSQL/src/Database/Models/Data/ApiSolution.cs rename to src/Solution-MSSQL/src/Database/Entities/ApiSolution.cs index a8f78eb..31e8eb3 100644 --- a/src/Solution-MSSQL/src/Database/Models/Data/ApiSolution.cs +++ b/src/Solution-MSSQL/src/Database/Entities/ApiSolution.cs @@ -1,3 +1,5 @@ +namespace placeHolder; + public class ApiSolution { diff --git a/src/Solution-MSSQL/src/Database/Entities/Directory.Build.props b/src/Solution-MSSQL/src/Database/Entities/Directory.Build.props new file mode 100644 index 0000000..8fcb2f1 --- /dev/null +++ b/src/Solution-MSSQL/src/Database/Entities/Directory.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Solution-MSSQL/src/Database/Models/Models.csproj b/src/Solution-MSSQL/src/Database/Entities/Entities.csproj similarity index 54% rename from src/Solution-MSSQL/src/Database/Models/Models.csproj rename to src/Solution-MSSQL/src/Database/Entities/Entities.csproj index 9623d5c..0cd4007 100644 --- a/src/Solution-MSSQL/src/Database/Models/Models.csproj +++ b/src/Solution-MSSQL/src/Database/Entities/Entities.csproj @@ -1,7 +1,4 @@ - - - diff --git a/src/Solution-Postgre/src/Common/Common.csproj b/src/Solution-Postgre/src/Common/Common.csproj index 956b394..0d72d06 100644 --- a/src/Solution-Postgre/src/Common/Common.csproj +++ b/src/Solution-Postgre/src/Common/Common.csproj @@ -1,4 +1,7 @@ - + + + + diff --git a/src/Solution/src/Common/Common.csproj b/src/Solution/src/Common/Common.csproj index f65d190..fe873f6 100644 --- a/src/Solution/src/Common/Common.csproj +++ b/src/Solution/src/Common/Common.csproj @@ -1,5 +1,9 @@ - + + + + +