Version 5.1.0-preview001

JonPSmith · Nov 4, 2021 · 386d9fd · 386d9fd
1 parent efce482
commit 386d9fd
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 49 deletions.
diff --git a/DataLayer/DataLayer.csproj b/DataLayer/DataLayer.csproj
@@ -1,13 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-rc.2.21480.5" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+	</PropertyGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
+		<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-rc.2.21480.5" />
+		<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/GenericServices/GenericServices.csproj b/GenericServices/GenericServices.csproj
@@ -1,11 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+	  <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="AutoMapper" Version="10.1.1" />
+		<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.11 " />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+		<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
+	</ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.0-rc.2.21480.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
@@ -14,10 +21,10 @@
 
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>6.0.0-preview001</PackageVersion>
-    <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <FileVersion>6.0.0.0</FileVersion>
+    <PackageVersion>5.1.0-preview001</PackageVersion>
+    <Version>5.1.0</Version>
+    <AssemblyVersion>5.1.0.0</AssemblyVersion>
+    <FileVersion>5.1.0.0</FileVersion>
     <Company>Selective Analytics</Company>
     <Authors>Jon P Smith</Authors>
     <PackageId>EfCore.GenericServices</PackageId>
@@ -29,7 +36,7 @@
     <RepositoryType>GuHub</RepositoryType>
     <PackageTags>Entity Framework Core, ASP.NET Core</PackageTags>
     <PackageReleaseNotes>
-		Updated to .NET 6.0 preview RC.2
+		Updated to support both EF Core 5 and EF Core 6-rc.2 preview
 	</PackageReleaseNotes>
     <PackageIcon>GenericServicesNuGetIcon128.png</PackageIcon>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/README.md b/README.md
@@ -4,14 +4,13 @@
 
 This library helps you quickly code Create, Read, Update and Delete (CRUD) accesses for a web/mobile/desktop application. It acts as a adapter and command pattern between a database accessed by Entity Framework Core (EF Core) and the needs of the front-end system. 
 
-**NOTE:** The first number in the version number of this library defines what version of EF Core it works for. e.g. 
+_NOTE: Version 5.1.0 and above of this library supports multiple versions of EF Core 5._
 
-- EfCore.GenericServices version 5 is works with to EF Core 5.
-- EfCore.GenericServices version 6 is works with to EF Core 6... and so on.
+- _Version 5.1.0 supports EF Core 5.10 and EF Core 6._
 
-_If are using the older versions of EF Core you should use [EfCore.GenericServices, version 3.2.2](https://www.nuget.org/packages/EfCore.GenericServices/3.2.2)._
+The EfCore.GenericServices library is available on [NuGet as EfCore.GenericServices](https://www.nuget.org/packages/EfCore.GenericServices/) and is an open-source library under the MIT licence. See [ReleaseNotes](https://github.com/JonPSmith/EfCore.GenericServices/blob/master/ReleaseNotes.md) for details of changes and information on each version of EfCore.GenericServices.
 
-The EfCore.GenericServices library is available on [NuGet as EfCore.GenericServices](https://www.nuget.org/packages/EfCore.GenericServices/) and is an open-source library under the MIT licence. See [ReleaseNotes](https://github.com/JonPSmith/EfCore.GenericServices/blob/master/ReleaseNotes.md) for details of changes and information on versions before EF Core 5.
+_If are using the older versions of EF Core you should use [EfCore.GenericServices, version 3.2.2](https://www.nuget.org/packages/EfCore.GenericServices/3.2.2)._
 
 ## Documentation and useful articles
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,8 +1,8 @@
 # Release Notes
 
-## 6.0.0-preview
+## 5.1.0-preview
 
-- Updated to .NET 6.0 preview RC.2
+- Updated to support both EF Core 5 and EF Core 6-rc.2 preview
 
 ## 5.0.1
 

diff --git a/ServiceLayer/ServiceLayer.csproj b/ServiceLayer/ServiceLayer.csproj
@@ -1,28 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="App_Start\**" />
-    <EmbeddedResource Remove="App_Start\**" />
-    <None Remove="App_Start\**" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\GenericServices\GenericServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="DatabaseCode\Services\" />
-  </ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
+	  <ProjectReference Include="..\GenericServices\GenericServices.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,14 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+	  <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+		<PackageReference Include="AutoMapper" Version="10.1.1" />
+		<PackageReference Include="EfCore.TestSupport" Version="5.1.0-preview001" />
+		<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.11" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
+		<PackageReference Include="GenericServices.StatusGeneric" Version="1.1.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+	</ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="EfCore.TestSupport" Version="6.0.0-preview001" />
+    <PackageReference Include="EfCore.TestSupport" Version="5.1.0-preview001" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.0-rc.2.21480.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0-preview3.21293.2" />

diff --git a/Tests/UnitTests/Performance/CompareAgainstHandCoded.cs b/Tests/UnitTests/Performance/CompareAgainstHandCoded.cs
@@ -182,7 +182,7 @@ public void TestPerformanceCreateDirectViaCtor()
 
                 context.ChangeTracker.Clear();
 
-                context.WipeAllDataFromDatabase();
+                context.Database.EnsureCreated();
                 var utData2 = context.SetupEntitiesDirect();
                 var service2 = new CrudServices<TestDbContext>(context, utData2.ConfigAndMapper);
 
@@ -196,7 +196,7 @@ public void TestPerformanceCreateDirectViaCtor()
 
                 context.ChangeTracker.Clear();
 
-                context.WipeAllDataFromDatabase();
+                context.Database.EnsureCreated();
                 using (new TimeThings(_output, "RunHandCoded Create", 100))
                 {
                     for (int i = 0; i < 100; i++)