From 794612ac978743bc418e70def32598b1126bb9ac Mon Sep 17 00:00:00 2001
From: Jesse Mandel <jesse.mandel@jdpa.com>
Date: Tue, 15 Apr 2025 09:50:20 -0700
Subject: [PATCH 1/2] Update to dotnet 9.0 but added other frameworks to
 continue supporting older frameworks and EF versions. Updated dependencies
 and relaxed versions to be more flexible. No code changes and tests still
 pass.

---
 .github/workflows/build-test-publish.yml        |  4 ++--
 README.md                                       |  2 +-
 .../EntityFrameworkCoreMock.Moq.csproj          |  6 +++---
 .../EntityFrameworkCoreMock.NSubstitute.csproj  |  6 +++---
 .../EntityFrameworkCoreMock.Shared.csproj       | 13 +++++++++++--
 .../EntityFrameworkCoreMock.Moq.Tests.csproj    | 16 +++++++++-------
 ...tyFrameworkCoreMock.NSubstitute.Tests.csproj | 17 ++++++++++-------
 .../EntityFrameworkCoreMock.Shared.Tests.csproj | 13 +++++++++----
 8 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index 22842ea..8e98e6c 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -24,10 +24,10 @@ jobs:
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
       uses: gittools/actions/gitversion/execute@v0.9.9
-    - name: Setup .NET 5
+    - name: Setup .NET 9
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.201
+        dotnet-version: 9.0.203
     - name: Install dependencies
       run: dotnet restore
     - name: Build
diff --git a/README.md b/README.md
index 91c0c15..07569dd 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![Build status](https://github.com/cup-of-tea-dot-be/entity-framework-core-mock/actions/workflows/build-test-publish.yml/badge.svg?branch=master)
 
-Easy Mock wrapper for mocking EntityFrameworkCore 5 (EFCore5) DbContext and DbSet in your unit-tests. Integrates with Moq or NSubstitute.
+Easy Mock wrapper for mocking EntityFrameworkCore 5 through 9 (EFCore5-9) DbContext and DbSet in your unit-tests. Integrates with Moq or NSubstitute.
 
 😢 Are you still stuck on EF Core 3.1? No worries, just visit [this repository](https://github.com/huysentruitw/entity-framework-core3-mock).
 
diff --git a/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj b/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
index 359abd6..0b1cac8 100644
--- a/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
+++ b/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Moq</Title>
     <Description>Easy Mock wrapper for mocking EntityFrameworkCore 5 (EFCore5) DbContext and DbSet using Moq</Description>
+    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
+
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
-    <PackageReference Include="Moq" Version="4.15.1" />
+    <PackageReference Include="Moq" Version="[4.20.72, 5.0.0)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj b/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
index 58718c4..8a452b6 100644
--- a/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
+++ b/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.NSubstitute</Title>
     <Description>Easy Mock wrapper for mocking EntityFrameworkCore 5 (EFCore5) DbContext and DbSet using NSubstitute</Description>
+    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
+
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="NSubstitute" Version="[4.2.2,6.0.0)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj b/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
index 698031d..0a9be99 100644
--- a/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
+++ b/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
@@ -3,10 +3,19 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Shared</Title>
     <Description>Shared code for EntityFrameworkCoreMock</Description>
+    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.0,6.0.0)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,8.0.0)" />
+  </ItemGroup>
+
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,10.0.0)" />
+  </ItemGroup>
 </Project>
diff --git a/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj b/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
index 2c3d90c..dbb1efb 100644
--- a/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>EntityFrameworkCoreMock.Moq.Tests</Title>
+    <Description>Tests for EntityFrameworkCoreMock.Moq</Description>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="Moq" Version="4.15.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj b/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
index 9289296..778188c 100644
--- a/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>EntityFrameworkCoreMock.Moq.Tests</Title>
+    <Description>Tests for EntityFrameworkCoreMock.Moq</Description>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\EntityFrameworkCoreMock.NSubstitute\EntityFrameworkCoreMock.NSubstitute.csproj" />
   </ItemGroup>
diff --git a/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj b/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
index dd9a50d..4c47cee 100644
--- a/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
@@ -1,14 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>EntityFrameworkCoreMock.Shared.Tests</Title>
+    <Description>Tests for EntityFrameworkCoreMock.Shared</Description>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\EntityFrameworkCoreMock.Shared\EntityFrameworkCoreMock.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.14.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="AutoFixture" Version="4.18.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

From 65871fc1b5a3017932d51919cbc22e4eb3ae427c Mon Sep 17 00:00:00 2001
From: Jesse Mandel <jesse.mandel@jdpa.com>
Date: Tue, 1 Jul 2025 12:17:16 -0700
Subject: [PATCH 2/2] Move `TargetFrameworks` updates to
 `Directory.Build.props`

---
 src/Directory.Build.props                                       | 2 +-
 .../EntityFrameworkCoreMock.Moq.csproj                          | 2 --
 .../EntityFrameworkCoreMock.NSubstitute.csproj                  | 2 --
 .../EntityFrameworkCoreMock.Shared.csproj                       | 2 --
 tests/Directory.Build.props                                     | 2 +-
 .../EntityFrameworkCoreMock.Moq.Tests.csproj                    | 1 -
 .../EntityFrameworkCoreMock.NSubstitute.Tests.csproj            | 1 -
 .../EntityFrameworkCoreMock.Shared.Tests.csproj                 | 1 -
 8 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 07866c1..53131a0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <Product>EntityFrameworkCoreMock</Product>
     <Version>1.0.0.0</Version>
     <Authors>Wouter Huysentruit</Authors>
diff --git a/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj b/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
index 0b1cac8..05c725c 100644
--- a/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
+++ b/src/EntityFrameworkCoreMock.Moq/EntityFrameworkCoreMock.Moq.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Moq</Title>
     <Description>Easy Mock wrapper for mocking EntityFrameworkCore 5 (EFCore5) DbContext and DbSet using Moq</Description>
-    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
-
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj b/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
index 8a452b6..4ffebb9 100644
--- a/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
+++ b/src/EntityFrameworkCoreMock.NSubstitute/EntityFrameworkCoreMock.NSubstitute.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.NSubstitute</Title>
     <Description>Easy Mock wrapper for mocking EntityFrameworkCore 5 (EFCore5) DbContext and DbSet using NSubstitute</Description>
-    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
-
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj b/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
index 0a9be99..c568ad1 100644
--- a/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
+++ b/src/EntityFrameworkCoreMock.Shared/EntityFrameworkCoreMock.Shared.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Shared</Title>
     <Description>Shared code for EntityFrameworkCoreMock</Description>
-    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
@@ -14,7 +13,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,8.0.0)" />
   </ItemGroup>
 
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,10.0.0)" />
   </ItemGroup>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 7546bdd..d42f837 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
diff --git a/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj b/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
index dbb1efb..8283c0d 100644
--- a/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.Moq.Tests/EntityFrameworkCoreMock.Moq.Tests.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Moq.Tests</Title>
     <Description>Tests for EntityFrameworkCoreMock.Moq</Description>
-    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj b/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
index 778188c..1a3b36b 100644
--- a/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.NSubstitute.Tests/EntityFrameworkCoreMock.NSubstitute.Tests.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Moq.Tests</Title>
     <Description>Tests for EntityFrameworkCoreMock.Moq</Description>
-    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj b/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
index 4c47cee..2fe5e6a 100644
--- a/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
+++ b/tests/EntityFrameworkCoreMock.Shared.Tests/EntityFrameworkCoreMock.Shared.Tests.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <Title>EntityFrameworkCoreMock.Shared.Tests</Title>
     <Description>Tests for EntityFrameworkCoreMock.Shared</Description>
-    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>