Feature/migration to net8 (#5)

* Upgrade the projects to the latest version of .net * Update the version number * Update the builds
LittleBlocks · Feb 25, 2024 · 766135c · 766135c
1 parent 2fce465
commit 766135c
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 65 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
       - name: Install dependencies
         run: dotnet restore src
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
       - name: Install dependencies
         run: dotnet restore src
       - name: Use GitVersion

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 1.0.1
+next-version: 2.0.0
 mode: Mainline
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'

diff --git a/src/LittleBlocks.Ef.Testing.UnitTests/LittleBlocks.Ef.Testing.UnitTests.csproj b/src/LittleBlocks.Ef.Testing.UnitTests/LittleBlocks.Ef.Testing.UnitTests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
-        <LangVersion>10</LangVersion>
+        <LangVersion>12</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.8.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.12" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="NSubstitute" Version="4.2.2" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/LittleBlocks.Ef.Testing/LittleBlocks.Ef.Testing.csproj b/src/LittleBlocks.Ef.Testing/LittleBlocks.Ef.Testing.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Mohammad Moattar</Authors>
     <Company>LittleBlocks</Company>
     <Description>LittleBlocks support for testing projects for UnitOfWork and Ef Core</Description>
     <PackageProjectUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</PackageProjectUrl>
     <RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</RepositoryUrl>
     <Version>1.0.0</Version>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
     <PackageIcon>Logo.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="LittleBlocks" Version="1.0.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="LittleBlocks" Version="2.0.0" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LittleBlocks.Ef\LittleBlocks.Ef.csproj" />

diff --git a/src/LittleBlocks.Ef.UnitOfWork.UnitTests/LittleBlocks.Ef.UnitOfWork.UnitTests.csproj b/src/LittleBlocks.Ef.UnitOfWork.UnitTests/LittleBlocks.Ef.UnitOfWork.UnitTests.csproj
@@ -2,23 +2,23 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Mohammad Moattar</Authors>
     <Company>LittleBlocks</Company>
     <Description>LittleBlocks support for entity framework core and UnitOfWork</Description>
     <PackageProjectUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</PackageProjectUrl>
     <RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</RepositoryUrl>
     <Version>1.0.0</Version>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.12" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/LittleBlocks.Ef.UnitOfWork/Extensions/PagingOptions.cs b/src/LittleBlocks.Ef.UnitOfWork/Extensions/PagingOptions.cs
@@ -6,8 +6,8 @@ public class PagingOptions
 
         public PagingOptions(int pageIndex, int pageSize = DefaultPageSize)
         {
-            if (pageSize <= 0) throw new ArgumentOutOfRangeException(nameof(pageSize));
-            if (pageIndex <= 0) throw new ArgumentOutOfRangeException(nameof(pageIndex));
+            ArgumentOutOfRangeException.ThrowIfNegativeOrZero(pageSize);
+            ArgumentOutOfRangeException.ThrowIfNegativeOrZero(pageIndex);
 
             PageIndex = pageIndex;
             PageSize = pageSize;

diff --git a/src/LittleBlocks.Ef.UnitOfWork/Extensions/QueryableExtensions.cs b/src/LittleBlocks.Ef.UnitOfWork/Extensions/QueryableExtensions.cs
@@ -4,25 +4,25 @@ public static class QueryableExtensions
     {
         public static IQueryable<T> PagedBy<T>(this IQueryable<T> queryable, PagingOptions options)
         {
-            if (queryable == null) throw new ArgumentNullException(nameof(queryable));
-            if (options == null) throw new ArgumentNullException(nameof(options));
+            ArgumentNullException.ThrowIfNull(queryable);
+            ArgumentNullException.ThrowIfNull(options);
 
             return queryable.PagedBy(options.PageIndex, options.PageSize);
         }
 
         public static IQueryable<T> PagedBy<T>(this IQueryable<T> queryable, int pageIndex, int pageSize)
         {
-            if (queryable == null) throw new ArgumentNullException(nameof(queryable));
-            if (pageIndex < 0) throw new ArgumentOutOfRangeException(nameof(pageIndex));
-            if (pageSize <= 0) throw new ArgumentOutOfRangeException(nameof(pageSize));
+            ArgumentNullException.ThrowIfNull(queryable);
+            ArgumentOutOfRangeException.ThrowIfNegative(pageIndex);
+            ArgumentOutOfRangeException.ThrowIfNegativeOrZero(pageSize);
 
             return queryable.Skip(pageIndex * pageSize).Take(pageSize);
         }        
 
         public static IQueryable<TResult> ProjectTo<T, TResult>(this IQueryable<T> queryable, Func<T, TResult> projection)
         {
-            if (queryable == null) throw new ArgumentNullException(nameof(queryable));
-            if (projection == null) throw new ArgumentNullException(nameof(projection));
+            ArgumentNullException.ThrowIfNull(queryable);
+            ArgumentNullException.ThrowIfNull(projection);
 
             return queryable.Select(m => projection(m));
         }

diff --git a/src/LittleBlocks.Ef.UnitOfWork/LittleBlocks.Ef.UnitOfWork.csproj b/src/LittleBlocks.Ef.UnitOfWork/LittleBlocks.Ef.UnitOfWork.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Mohammad Moattar</Authors>
     <Company>LittleBlocks</Company>
     <Description>LittleBlocks support for entity framework core and UnitOfWork</Description>
     <PackageProjectUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</PackageProjectUrl>
     <RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</RepositoryUrl>
     <Version>1.0.0</Version>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
     <PackageIcon>Logo.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.AutoHistory" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Logo.png">

diff --git a/src/LittleBlocks.Ef.UnitOfWork/UnitOfWork.cs b/src/LittleBlocks.Ef.UnitOfWork/UnitOfWork.cs
@@ -23,14 +23,13 @@
 
 namespace LittleBlocks.Ef.UnitOfWork
 {
-    public sealed class UnitOfWork<TContext> : IRepositoryFactory, IUnitOfWork<TContext> where TContext : DbContext
+    public sealed class UnitOfWork<TContext>(TContext context) : IRepositoryFactory, IUnitOfWork<TContext>
+        where TContext : DbContext
     {
         private bool _disposed;
         private Dictionary<Type, object> _repositories;
 
-        public UnitOfWork(TContext context) => DbContext = context ?? throw new ArgumentNullException(nameof(context));
-
-        public TContext DbContext { get; }
+        public TContext DbContext { get; } = context ?? throw new ArgumentNullException(nameof(context));
 
         public IRepository<TEntity> GetRepository<TEntity>(bool hasCustomRepository = false) where TEntity : class
         {

diff --git a/src/LittleBlocks.Ef.UnitTests/LittleBlocks.Ef.UnitTests.csproj b/src/LittleBlocks.Ef.UnitTests/LittleBlocks.Ef.UnitTests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
       <IsPackable>false</IsPackable>
-      <LangVersion>10</LangVersion>
+      <LangVersion>12</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-      <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-      <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+      <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/LittleBlocks.Ef.sln b/src/LittleBlocks.Ef.sln
@@ -14,6 +14,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extras", "Extras", "{966C50CB-3F74-442F-842D-164645690476}"
 	ProjectSection(SolutionItems) = preProject
 		..\GitVersion.yml = ..\GitVersion.yml
+		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
+		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBlocks.Ef.UnitOfWork", "LittleBlocks.Ef.UnitOfWork\LittleBlocks.Ef.UnitOfWork.csproj", "{E9B92105-F4C6-42B5-B3CF-64FA80486E93}"

diff --git a/src/LittleBlocks.Ef/DbContextBase.cs b/src/LittleBlocks.Ef/DbContextBase.cs
@@ -17,14 +17,10 @@
 
 namespace LittleBlocks.Ef;
 
-public abstract class DbContextBase : DbContext
+public abstract class DbContextBase(DbContextOptions options, IOperationContext operationContext)
+    : DbContext(options)
 {
-    private readonly IOperationContext _operationContext;
-
-    protected DbContextBase(DbContextOptions options, IOperationContext operationContext) : base(options)
-    {
-        _operationContext = operationContext ?? throw new ArgumentNullException(nameof(operationContext));
-    }
+    private readonly IOperationContext _operationContext = operationContext ?? throw new ArgumentNullException(nameof(operationContext));
 
     public override int SaveChanges(bool acceptAllChangesOnSuccess)
     {

diff --git a/src/LittleBlocks.Ef/DbContextExtensions.cs b/src/LittleBlocks.Ef/DbContextExtensions.cs
@@ -35,7 +35,7 @@ public static IServiceCollection AddSqlDbContext<TDbContext>(this IServiceCollec
     public static IServiceCollection AddSqlDbContext<TDbContext>(this IServiceCollection services,
         string connectionString, Action<SqlServerDbContextOptionsBuilder> sqlOptionsAction) where TDbContext : DbContext
     {
-        if (services == null) throw new ArgumentNullException(nameof(services));
+        ArgumentNullException.ThrowIfNull(services);
 
         services.AddDbContext<TDbContext>(options => options.UseSqlServer(connectionString, sqlOptionsAction));
         services.AddUnitOfWork<TDbContext>();

diff --git a/src/LittleBlocks.Ef/Extensions/PrincipalExtensions.cs b/src/LittleBlocks.Ef/Extensions/PrincipalExtensions.cs
@@ -30,7 +30,7 @@ public static string GetUserName(this IPrincipal principal)
         if (!string.IsNullOrWhiteSpace(identity.Name))
             return identity.Name;
 
-        if (!(identity is ClaimsIdentity claimsIdentity))
+        if (identity is not ClaimsIdentity claimsIdentity)
             return AnonymousUser;
 
         var claim = claimsIdentity.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name);

diff --git a/src/LittleBlocks.Ef/LittleBlocks.Ef.csproj b/src/LittleBlocks.Ef/LittleBlocks.Ef.csproj
@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Mohammad Moattar</Authors>
     <Company>LittleBlocks</Company>
     <Description>LittleBlocks support for entity framework core and UnitOfWork</Description>
     <PackageProjectUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</PackageProjectUrl>
     <RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Ef</RepositoryUrl>
     <Version>1.0.0</Version>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
     <PackageIcon>Logo.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LittleBlocks.Extensions" Version="1.0.1" />
-    <PackageReference Include="LittleBlocks.Http" Version="1.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.12">
+    <PackageReference Include="LittleBlocks.Extensions" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Http" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LittleBlocks.Ef.UnitOfWork\LittleBlocks.Ef.UnitOfWork.csproj" />