Skip to content

Commit

Permalink
Refactor project structure and add package references
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Gary Woodfine committed Jan 17, 2024
1 parent c8184ab commit e9e0189
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 22 deletions.
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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? )

1 change: 1 addition & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mode: Mainline
commit-message-incrementing: MergeMessageOnly
branches:
main:
tag: ''
Expand Down
9 changes: 6 additions & 3 deletions src/Solution-MSSQL/ApiSolution.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}
Expand Down
4 changes: 4 additions & 0 deletions src/Solution-MSSQL/src/Common/Common.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>


</Project>
6 changes: 1 addition & 5 deletions src/Solution-MSSQL/src/Database/Database/Database.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">




<ItemGroup>
<ProjectReference Include="..\Models\Models.csproj" />
<ProjectReference Include="..\Entities\Entities.csproj" />
</ItemGroup>

</Project>
10 changes: 1 addition & 9 deletions src/Solution-MSSQL/src/Database/Database/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
<PackageReference Include="Threenine.Database.Configuration" Version="1.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
</Project>
12 changes: 12 additions & 0 deletions src/Solution-MSSQL/src/Database/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
<ItemGroup>
<PackageReference Include="Threenine.Data" Version="5.0.1"/>
<PackageReference Include="Threenine.Database.Configuration" Version="1.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1"/>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
namespace placeHolder;

public class ApiSolution
{

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Threenine.Database.Configuration" Version="1.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common.csproj" />
</ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion src/Solution-Postgre/src/Common/Common.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/Solution/src/Common/Common.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">


<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>


</Project>

0 comments on commit e9e0189

Please sign in to comment.