Added EF7 support (#125)

aivascu · Jan 5, 2023 · d483899 · d483899
1 parent 6aee90c
commit d483899
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 16 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "nuke.globaltool": {
+      "version": "6.3.0",
+      "commands": [
+        "nuke"
+      ]
+    }
+  }
+}
diff --git a/EntityFrameworkCore.AutoFixture.sln b/EntityFrameworkCore.AutoFixture.sln
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.AutoFix
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.AutoFixture.EF5.Tests", "tests\EntityFrameworkCore.AutoFixture.EF5.Tests\EntityFrameworkCore.AutoFixture.EF5.Tests.csproj", "{A03F7586-05F7-45AD-847D-02C1DB6E0FE7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.AutoFixture.EF6.Tests", "tests\EntityFrameworkCore.AutoFixture.EF6.Tests\EntityFrameworkCore.AutoFixture.EF6.Tests.csproj", "{41937419-0EB6-4AEB-AFF7-F613C5315751}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,6 +55,10 @@ Global
 		{A03F7586-05F7-45AD-847D-02C1DB6E0FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A03F7586-05F7-45AD-847D-02C1DB6E0FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A03F7586-05F7-45AD-847D-02C1DB6E0FE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41937419-0EB6-4AEB-AFF7-F613C5315751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41937419-0EB6-4AEB-AFF7-F613C5315751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41937419-0EB6-4AEB-AFF7-F613C5315751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41937419-0EB6-4AEB-AFF7-F613C5315751}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/EntityFrameworkCore.AutoFixture/EntityFrameworkCore.AutoFixture.csproj b/src/EntityFrameworkCore.AutoFixture/EntityFrameworkCore.AutoFixture.csproj
@@ -16,31 +16,27 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="[2.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[2.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[2.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[2.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="[2.1.0, 5.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="[3.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[3.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[3.0.0, 5.0.0)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="[3.0.0, 5.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net5.'))">
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net6.'))">
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />

diff --git a/...ntityFrameworkCore.AutoFixture.EF2.Tests/EntityFrameworkCore.AutoFixture.EF2.Tests.csproj b/...ntityFrameworkCore.AutoFixture.EF2.Tests/EntityFrameworkCore.AutoFixture.EF2.Tests.csproj
@@ -13,10 +13,10 @@
 
     <PackageReference Include="Moq" Version="4.14.5" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ntityFrameworkCore.AutoFixture.EF3.Tests/EntityFrameworkCore.AutoFixture.EF3.Tests.csproj b/...ntityFrameworkCore.AutoFixture.EF3.Tests/EntityFrameworkCore.AutoFixture.EF3.Tests.csproj
@@ -14,9 +14,9 @@
     <PackageReference Include="Moq" Version="4.14.5" />
 
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.27" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.27" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.27" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.27" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,10 +25,6 @@
     <Compile Remove="..\EntityFrameworkCore.AutoFixture.Tests\Migrations\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Core" />
-  </ItemGroup>
-
   <Choose>
     <When Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
       <ItemGroup>

diff --git a/...ntityFrameworkCore.AutoFixture.EF5.Tests/EntityFrameworkCore.AutoFixture.EF5.Tests.csproj b/...ntityFrameworkCore.AutoFixture.EF5.Tests/EntityFrameworkCore.AutoFixture.EF5.Tests.csproj
@@ -13,9 +13,10 @@
 
     <PackageReference Include="Moq" Version="4.14.5"/>
 
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.17"/>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.17"/>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ntityFrameworkCore.AutoFixture.EF6.Tests/EntityFrameworkCore.AutoFixture.EF6.Tests.csproj b/...ntityFrameworkCore.AutoFixture.EF6.Tests/EntityFrameworkCore.AutoFixture.EF6.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\Common.Tests.props"/>
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" Version="4.14.0"/>
+    <PackageReference Include="AutoFixture.AutoMoq" Version="4.14.0"/>
+    <PackageReference Include="AutoFixture.Idioms" Version="4.14.0"/>
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0"/>
+
+    <PackageReference Include="Moq" Version="4.14.5"/>
+
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.12"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.12" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\EntityFrameworkCore.AutoFixture.Tests\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)"/>
+    <Compile Remove="..\EntityFrameworkCore.AutoFixture.Tests\obj\**"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\EntityFrameworkCore.AutoFixture\EntityFrameworkCore.AutoFixture.csproj"/>
+  </ItemGroup>
+</Project>
diff --git a/tests/EntityFrameworkCore.AutoFixture.Tests/EntityFrameworkCore.AutoFixture.Tests.csproj b/tests/EntityFrameworkCore.AutoFixture.Tests/EntityFrameworkCore.AutoFixture.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Common.Tests.props" />
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
@@ -12,9 +13,10 @@
 
     <PackageReference Include="Moq" Version="4.14.5" />
 
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>