Support .NET 6 and 7 removed.

Bruno de Souza Melo · Bruno de Souza Melo · commit f71ddb64a759 · 2024-09-15T11:22:16.000-03:00
Nullable full reviewed.
diff --git a/docs/Publishing.txt b/docs/Publishing.txt
@@ -1,2 +1,2 @@
-nuget.exe push -Source "nuvtools" -ApiKey az NuvTools.AspNetCore.8.0.0.nupkg
-nuget.exe push -Source "nuvtools" -ApiKey az NuvTools.AspNetCore.EntityFrameworkCore.8.0.0.nupkg
+nuget.exe push -Source "nuvtools" -ApiKey az NuvTools.AspNetCore.8.1.0.nupkg
+nuget.exe push -Source "nuvtools" -ApiKey az NuvTools.AspNetCore.EntityFrameworkCore.8.1.0.nupkg
diff --git a/src/NuvTools.AspNetCore.EntityFrameworkCore/Mapper/ServiceWithCrudBase.cs b/src/NuvTools.AspNetCore.EntityFrameworkCore/Mapper/ServiceWithCrudBase.cs
@@ -7,37 +7,34 @@
 
 namespace NuvTools.AspNetCore.EntityFrameworkCore.Mapper;
 
-public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey> : ServiceWithMapperBase<TDTO, TEntity>
+public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey>(TContext context, IMapper mapper) : ServiceWithMapperBase<TDTO, TEntity>(mapper)
                                                                 where TDTO : class
                                                                 where TEntity : class
                                                                 where TContext : DbContext
+                                                                where TKey : notnull
 {
-    protected readonly TContext Context;
-
-    public ServiceWithCrudBase(TContext context, IMapper mapper) : base(mapper)
-    {
-        Context = context;
-    }
+    protected readonly TContext Context = context;
 
     public DbSet<TEntity> Dataset { get { return Context.Set<TEntity>(); } }
 
-    public async Task<TDTO> FindAsync(TKey id)
+    public async Task<TDTO?> FindAsync(TKey id)
     {
         return ConvertToDTO(await Context.FindAsync<TEntity>(id));
     }
 
-    public async Task<TDTO> FindAsync(object[] keys)
+    public async Task<TDTO?> FindAsync(object[] keys)
     {
         return ConvertToDTO(await Context.FindAsync<TEntity>(keys));
     }
 
-    public async Task<IEnumerable<TDTO>> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)
+    public async Task<IEnumerable<TDTO>?> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)
     {
         return ConvertToDTO(await Context.FromExpression(expression).ToListAsync());
     }
 
     public virtual async Task<IResult<TKey>> AddAndSaveAsync(TDTO model)
     {
+        ArgumentNullException.ThrowIfNull(model, nameof(model));
         return await Context.AddAndSaveAsync<TEntity, TKey>(ConvertToEntity(model));
     }
 
diff --git a/src/NuvTools.AspNetCore.EntityFrameworkCore/NuvTools.AspNetCore.EntityFrameworkCore.csproj b/src/NuvTools.AspNetCore.EntityFrameworkCore/NuvTools.AspNetCore.EntityFrameworkCore.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6;net7;net8</TargetFrameworks>
+		<TargetFrameworks>net8</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>Nuv Tools</Authors>
 		<Copyright>Copyright © 2024 Nuv Tools</Copyright>
-		<PackageProjectUrl>https://nuv.tools</PackageProjectUrl>
+		<PackageProjectUrl>https://nuvtools.com</PackageProjectUrl>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>NuvTools.AspNetCore.EntityFrameworkCore.snk</AssemblyOriginatorKeyFile>
 		<Description>EntityFramework Core helper library to use with ASP.NET Aplications.</Description>
-		<Version>8.0.3</Version>
+		<Version>8.1.0</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
 		<PackageIcon>icon.png</PackageIcon>
@@ -22,26 +22,16 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageTags>Nuv Tools AspNetCore Entity Framework Core</PackageTags>
 		<ImplicitUsings>true</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 		
-		<PackageReference Include="NuvTools.Data.EntityFrameworkCore" Version="8.0.3" />
+		<PackageReference Include="NuvTools.Data.EntityFrameworkCore" Version="8.1.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(targetframework)' == 'net6'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(targetframework)' == 'net7'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(targetframework)' == 'net8'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
-	</ItemGroup>
-	
 	<ItemGroup>
 		<None Include="..\..\icon.png">
 			<Link>icon.png</Link>
diff --git a/src/NuvTools.AspNetCore/Mapper/ServiceWithMapperBase.cs b/src/NuvTools.AspNetCore/Mapper/ServiceWithMapperBase.cs
@@ -2,59 +2,58 @@
 
 namespace NuvTools.AspNetCore.Mapper;
 
-public abstract class ServiceWithMapperBase<TDTO, TEntity> where TDTO : class
+public abstract class ServiceWithMapperBase<TDTO, TEntity>(IMapper mapper) where TDTO : class
                                                     where TEntity : class
 {
-    private readonly IMapper _mapper;
-
     protected IMapper Mapper
     {
         get
         {
-            return _mapper;
+            return mapper;
         }
     }
 
-    public ServiceWithMapperBase(IMapper mapper)
-    {
-        _mapper = mapper;
-    }
-
     #region Converter
 
-    protected TReturn ConvertTo<TReturn>(TEntity model)
+    protected TReturn? ConvertTo<TReturn>(TEntity? model)
     {
-        return _mapper.Map<TReturn>(model);
+        if (model is null) return default;
+        return mapper.Map<TReturn>(model);
     }
 
-    protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TEntity> models)
+    protected IEnumerable<TReturn>? ConvertTo<TReturn>(IEnumerable<TEntity>? models)
     {
-        return _mapper.Map<IEnumerable<TReturn>>(models);
+        if (models is null) return null;
+        return mapper.Map<IEnumerable<TReturn>>(models);
     }
 
     protected TEntity ConvertToEntity(TDTO model)
     {
-        return _mapper.Map<TEntity>(model);
+        return mapper.Map<TEntity>(model);
     }
 
-    protected TDTO ConvertToDTO(TEntity model)
+    protected TDTO? ConvertToDTO(TEntity? model)
     {
-        return _mapper.Map<TDTO>(model);
+        if (model is null) return null;
+        return mapper.Map<TDTO>(model);
     }
 
-    protected IEnumerable<TDTO> ConvertToDTO(IEnumerable<TEntity> models)
-    {   
-        return _mapper.Map<IEnumerable<TDTO>>(models);
+    protected IEnumerable<TDTO>? ConvertToDTO(IEnumerable<TEntity>? models)
+    {
+        if (models is null) return null;
+        return mapper.Map<IEnumerable<TDTO>>(models);
     }
 
-    protected IList<TDTO> ConvertToDTO(IList<TEntity> models)
+    protected IList<TDTO>? ConvertToDTO(IList<TEntity>? models)
     {
-        return _mapper.Map<IList<TDTO>>(models);
+        if (models is null) return null;
+        return mapper.Map<IList<TDTO>>(models);
     }
 
-    protected TDTO[] ConvertToDTO(TEntity[] models)
+    protected TDTO[]? ConvertToDTO(TEntity[]? models)
     {
-        return _mapper.Map<TDTO[]>(models);
+        if (models is null) return null;
+        return mapper.Map<TDTO[]>(models);
     }
 
     #endregion
diff --git a/src/NuvTools.AspNetCore/NuvTools.AspNetCore.csproj b/src/NuvTools.AspNetCore/NuvTools.AspNetCore.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6;net7;net8</TargetFrameworks>
+		<TargetFrameworks>net8</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>Nuv Tools</Authors>
 		<Copyright>Copyright © 2024 Nuv Tools</Copyright>
-		<PackageProjectUrl>https://nuv.tools</PackageProjectUrl>
+		<PackageProjectUrl>https://nuvtools.com</PackageProjectUrl>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>NuvTools.AspNetCore.snk</AssemblyOriginatorKeyFile>
 		<Description>Common library with helpers to use with ASP.NET Aplications.</Description>
-		<Version>8.0.2</Version>
+		<Version>8.1.0</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
 		<PackageIcon>icon.png</PackageIcon>
@@ -22,6 +22,7 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageTags>Nuv Tools AspNetCore</PackageTags>
 		<ImplicitUsings>true</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -43,18 +44,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoMapper" Version="13.0.1" />
+		<PackageReference Include="Microsoft.JSInterop" Version="8.0.8" />
 	</ItemGroup>
-
-	<ItemGroup Condition="'$(targetframework)' == 'net6'">
-		<PackageReference Include="Microsoft.JSInterop" Version="6.0.27" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(targetframework)' == 'net7'">
-		<PackageReference Include="Microsoft.JSInterop" Version="7.0.16" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(targetframework)' == 'net8'">
-		<PackageReference Include="Microsoft.JSInterop" Version="8.0.2" />
-	</ItemGroup>
-
+	
 </Project>
diff --git a/tests/NuvTools.AspNetCore.Tests/NuvTools.AspNetCore.Tests.csproj b/tests/NuvTools.AspNetCore.Tests/NuvTools.AspNetCore.Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.0.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -7,37 +7,34 @@`
`7`	`7`
`8`	`8`	`namespace NuvTools.AspNetCore.EntityFrameworkCore.Mapper;`
`9`	`9`
`10`		`-public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey> : ServiceWithMapperBase<TDTO, TEntity>`
	`10`	`+public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey>(TContext context, IMapper mapper) : ServiceWithMapperBase<TDTO, TEntity>(mapper)`
`11`	`11`	`where TDTO : class`
`12`	`12`	`where TEntity : class`
`13`	`13`	`where TContext : DbContext`
	`14`	`+ where TKey : notnull`
`14`	`15`	`{`
`15`		`- protected readonly TContext Context;`
`16`		`-`
`17`		`- public ServiceWithCrudBase(TContext context, IMapper mapper) : base(mapper)`
`18`		`- {`
`19`		`- Context = context;`
`20`		`- }`
	`16`	`+ protected readonly TContext Context = context;`
`21`	`17`
`22`	`18`	`public DbSet<TEntity> Dataset { get { return Context.Set<TEntity>(); } }`
`23`	`19`
`24`		`- public async Task<TDTO> FindAsync(TKey id)`
	`20`	`+ public async Task<TDTO?> FindAsync(TKey id)`
`25`	`21`	`{`
`26`	`22`	`return ConvertToDTO(await Context.FindAsync<TEntity>(id));`
`27`	`23`	`}`
`28`	`24`
`29`		`- public async Task<TDTO> FindAsync(object[] keys)`
	`25`	`+ public async Task<TDTO?> FindAsync(object[] keys)`
`30`	`26`	`{`
`31`	`27`	`return ConvertToDTO(await Context.FindAsync<TEntity>(keys));`
`32`	`28`	`}`
`33`	`29`
`34`		`- public async Task<IEnumerable<TDTO>> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)`
	`30`	`+ public async Task<IEnumerable<TDTO>?> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)`
`35`	`31`	`{`
`36`	`32`	`return ConvertToDTO(await Context.FromExpression(expression).ToListAsync());`
`37`	`33`	`}`
`38`	`34`
`39`	`35`	`public virtual async Task<IResult<TKey>> AddAndSaveAsync(TDTO model)`
`40`	`36`	`{`
	`37`	`+ ArgumentNullException.ThrowIfNull(model, nameof(model));`
`41`	`38`	`return await Context.AddAndSaveAsync<TEntity, TKey>(ConvertToEntity(model));`
`42`	`39`	`}`
`43`	`40`
Original file line number	Diff line number	Diff line change
`@@ -2,59 +2,58 @@`
`2`	`2`
`3`	`3`	`namespace NuvTools.AspNetCore.Mapper;`
`4`	`4`
`5`		`-public abstract class ServiceWithMapperBase<TDTO, TEntity> where TDTO : class`
	`5`	`+public abstract class ServiceWithMapperBase<TDTO, TEntity>(IMapper mapper) where TDTO : class`
`6`	`6`	`where TEntity : class`
`7`	`7`	`{`
`8`		`- private readonly IMapper _mapper;`
`9`		`-`
`10`	`8`	`protected IMapper Mapper`
`11`	`9`	`{`
`12`	`10`	`get`
`13`	`11`	`{`
`14`		`- return _mapper;`
	`12`	`+ return mapper;`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`
`18`		`- public ServiceWithMapperBase(IMapper mapper)`
`19`		`- {`
`20`		`- _mapper = mapper;`
`21`		`- }`
`22`		`-`
`23`	`16`	`#region Converter`
`24`	`17`
`25`		`- protected TReturn ConvertTo<TReturn>(TEntity model)`
	`18`	`+ protected TReturn? ConvertTo<TReturn>(TEntity? model)`
`26`	`19`	`{`
`27`		`- return _mapper.Map<TReturn>(model);`
	`20`	`+ if (model is null) return default;`
	`21`	`+ return mapper.Map<TReturn>(model);`
`28`	`22`	`}`
`29`	`23`
`30`		`- protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TEntity> models)`
	`24`	`+ protected IEnumerable<TReturn>? ConvertTo<TReturn>(IEnumerable<TEntity>? models)`
`31`	`25`	`{`
`32`		`- return _mapper.Map<IEnumerable<TReturn>>(models);`
	`26`	`+ if (models is null) return null;`
	`27`	`+ return mapper.Map<IEnumerable<TReturn>>(models);`
`33`	`28`	`}`
`34`	`29`
`35`	`30`	`protected TEntity ConvertToEntity(TDTO model)`
`36`	`31`	`{`
`37`		`- return _mapper.Map<TEntity>(model);`
	`32`	`+ return mapper.Map<TEntity>(model);`
`38`	`33`	`}`
`39`	`34`
`40`		`- protected TDTO ConvertToDTO(TEntity model)`
	`35`	`+ protected TDTO? ConvertToDTO(TEntity? model)`
`41`	`36`	`{`
`42`		`- return _mapper.Map<TDTO>(model);`
	`37`	`+ if (model is null) return null;`
	`38`	`+ return mapper.Map<TDTO>(model);`
`43`	`39`	`}`
`44`	`40`
`45`		`- protected IEnumerable<TDTO> ConvertToDTO(IEnumerable<TEntity> models)`
`46`		`- {`
`47`		`- return _mapper.Map<IEnumerable<TDTO>>(models);`
	`41`	`+ protected IEnumerable<TDTO>? ConvertToDTO(IEnumerable<TEntity>? models)`
	`42`	`+ {`
	`43`	`+ if (models is null) return null;`
	`44`	`+ return mapper.Map<IEnumerable<TDTO>>(models);`
`48`	`45`	`}`
`49`	`46`
`50`		`- protected IList<TDTO> ConvertToDTO(IList<TEntity> models)`
	`47`	`+ protected IList<TDTO>? ConvertToDTO(IList<TEntity>? models)`
`51`	`48`	`{`
`52`		`- return _mapper.Map<IList<TDTO>>(models);`
	`49`	`+ if (models is null) return null;`
	`50`	`+ return mapper.Map<IList<TDTO>>(models);`
`53`	`51`	`}`
`54`	`52`
`55`		`- protected TDTO[] ConvertToDTO(TEntity[] models)`
	`53`	`+ protected TDTO[]? ConvertToDTO(TEntity[]? models)`
`56`	`54`	`{`
`57`		`- return _mapper.Map<TDTO[]>(models);`
	`55`	`+ if (models is null) return null;`
	`56`	`+ return mapper.Map<TDTO[]>(models);`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`#endregion`