+semver: breaking

Upgraded to Dotnet 7 and various changes to enable that
threenine · Sep 2, 2023 · 3fd8e58 · 3fd8e58
1 parent af7ee82
commit 3fd8e58
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 45 deletions.
diff --git a/Database.sln b/Database.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Threenine.Database.Configuration", "src\Threenine.Database.Configuration.csproj", "{7CFA795D-63F9-4C5C-B427-7282921DC128}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "src\Configuration.csproj", "{7CFA795D-63F9-4C5C-B427-7282921DC128}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F5F29E25-ED8F-4A47-BC35-DDA352EC02DE}"
 EndProject

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,10 +1,24 @@
+
+
 <Project>
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <ImplicitUsings>true</ImplicitUsings>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>disable</Nullable>
-        <RootNamespace>Threenine</RootNamespace>
-    </PropertyGroup>
+<PropertyGroup>
+    <Authors>threenine.co.uk</Authors>
+    <TargetFramework>net7.0</TargetFramework>
+    <Title>Threenine Database Configuration</Title>
+    <Description>Provides an opinionated approach and tools </Description>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>bitcoin, lightning</PackageTags>
+    <RepositoryUrl>https://github.com/threenine/paybolt</RepositoryUrl>
+    <Copyright>Copyright © $([System.DateTime]::Now.ToString("yyyy")) Three Nine Consulting Limited</Copyright>
+    <PackageProjectUrl>https://www.threenine.co.uk/paybolt</PackageProjectUrl>
+    <license>https://github.com/threenine/database.configuration/blob/master/LICENSE</license>
+    <PackageIcon>icon.png</PackageIcon>
+    <Version></Version>
+    <RootNamespace>Threenine.Database</RootNamespace>
+</PropertyGroup>
+<ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="/">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+</ItemGroup>
 </Project>
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright (c) 2023 threenine.co.uk
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/BaseContext.cs b/src/BaseContext.cs
@@ -1,4 +1,9 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Threenine.Models;
 

diff --git a/src/Threenine.Database.Configuration.csproj → src/Configuration.csproj b/src/Threenine.Database.Configuration.csproj → src/Configuration.csproj
@@ -3,13 +3,14 @@
     <PropertyGroup>
         <IsPackable>true</IsPackable>
         <PackageReadmeFile>README.md</PackageReadmeFile>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Configurations/PostgreSql/BaseEntityTypeConfiguration.cs b/src/Configurations/PostgreSql/BaseEntityTypeConfiguration.cs
@@ -1,14 +1,15 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Threenine.Configurations.PostgreSql;
 using Threenine.Models;
 
-namespace Threenine.Configurations.PostgreSql;
+namespace Threenine.Database.Configuration.PostgreSql;
 
 public abstract class BaseEntityTypeConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : BaseEntity
 {
     public virtual void Configure(EntityTypeBuilder<TEntity> builder)
     {
-        builder.ToTable(typeof(TEntity).Name.ToLower());
+        builder.ToTable(typeof(TEntity).Name.ToSnakeCase());
         builder.HasKey(x => x.Id);
 
         builder.Property(e => e.Id)

diff --git a/src/Configurations/PostgreSql/ValueListTypeConfiguration.cs b/src/Configurations/PostgreSql/ValueListTypeConfiguration.cs
@@ -8,7 +8,7 @@ public abstract class ValueListTypeConfiguration<TEntity> : IEntityTypeConfigura
 {
     public virtual void Configure(EntityTypeBuilder<TEntity> builder)
     {
-        builder.ToTable(typeof(TEntity).Name.ToLower());
+        builder.ToTable(typeof(TEntity).Name.ToSnakeCase());
 
         builder.HasKey(x => x.Id);
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
diff --git a/src/Models/BaseEntity.cs b/src/Models/BaseEntity.cs
@@ -1,4 +1,6 @@
-namespace Threenine.Models;
+using System;
+
+namespace Threenine.Models;
 
 public abstract class BaseEntity
 {

diff --git a/src/README.md b/src/README.md
@@ -1,20 +1,14 @@
-### Database configuration Helper
-
-A helper to ease the configuration of Entity Framework Cire database projects when using the `IEntityTypeConfiguration` pattern.
-
-In most Enterprise Software solutions database schemas and database design patterns usually comprise of the [Star Schema](https://en.wikipedia.org/wiki/Star_schema) or [Snowflake Schema](https://en.wikipedia.org/wiki/Snowflake_schema) design patterns.
-
-```mermaid
-erDiagram
-    CUSTOMER }|..|{ DELIVERY-ADDRESS : has
-    CUSTOMER ||--o{ ORDER : places
-    CUSTOMER ||--o{ INVOICE : "liable for"
-    DELIVERY-ADDRESS ||--o{ ORDER : receives
-    INVOICE ||--|{ ORDER : covers
-    ORDER ||--|{ ORDER-ITEM : includes
-    PRODUCT-CATEGORY ||--|{ PRODUCT : contains
-    PRODUCT ||--o{ ORDER-ITEM : "ordered in"
-```
+### Threenine Database configuration Helper
+
+Provides a helper to ease the configuration of Entity Framework Code First database projects when using the 
+`IEntityTypeConfiguration` pattern. Offering an opinionated approach to relational database design patterns, with helper 
+classes to configure both Microsoft SQL Server and PostgreSQL databases, primarily because these are the two most common
+relational database engines used in the Enterprise Software solutions and typically what we use at Threenine.
+
+
+
+
+
 
 
 

diff --git a/tests/Unit/ContextBaseEntityTests.cs b/tests/Unit/ContextBaseEntityTests.cs
@@ -1,4 +1,7 @@
-using Shouldly;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
 using Unit.Tests.TestFixtures;
 using Xunit;
 

diff --git a/tests/Unit/ContextValueEntityTests.cs b/tests/Unit/ContextValueEntityTests.cs
@@ -1,4 +1,6 @@
-using Shouldly;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
 using Unit.Tests.TestFixtures;
 using Xunit;
 
@@ -21,7 +23,6 @@ public async Task ShouldSaveDateTime()
         var save = await repo.AddAsync(new TestValueListEntity { Name = "test" });
 
         await  _fixture.Context.SaveChangesAsync();
-
 
        save.Entity.Id.ShouldBeOfType<int>();
     }

diff --git a/tests/Unit/Directory.Build.props b/tests/Unit/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+</Project>
diff --git a/tests/Unit/Models/BaseEntityTests.cs b/tests/Unit/Models/BaseEntityTests.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using Shouldly;
 using Threenine.Models;
 using Xunit;

diff --git a/tests/Unit/Models/ValueListEntityTests.cs b/tests/Unit/Models/ValueListEntityTests.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using Shouldly;
 using Threenine.Models;
 using Xunit;

diff --git a/tests/Unit/TestFixtures/InMemoryFixture.cs b/tests/Unit/TestFixtures/InMemoryFixture.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Unit.Tests.TestFixtures;

diff --git a/tests/Unit/Unit.csproj b/tests/Unit/Unit.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="6.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.10" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="NBuilder" Version="6.1.0" />
@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Threenine.Database.Configuration.csproj" />
+      <ProjectReference Include="..\..\src\Configuration.csproj" />
     </ItemGroup>
 
 </Project>