From 9f6dc05f83110c0a0248f37ec986a9d8112b585b Mon Sep 17 00:00:00 2001
From: Stewart McGuire <stewart.mcguire@arcadis.com>
Date: Fri, 3 Oct 2025 06:55:41 -0600
Subject: [PATCH 1/2] Updated adapter to use latest stable version of
 Casbin.NET (2.16.0) and updated Configuration to ignore additional Value13
 and Value14 columns.

---
 Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs  | 5 ++++-
 .../Casbin.Persist.Adapter.EFCore.csproj                     | 2 +-
 .../DefaultPersistPolicyEntityTypeConfiguration.cs           | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs b/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
index a9ae7b7..f30d730 100644
--- a/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
+++ b/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
@@ -3,6 +3,7 @@
 using Casbin.Persist.Adapter.EFCore.Entities;
 using Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures;
 using Xunit;
+using System;
 
 namespace Casbin.Persist.Adapter.EFCore.UnitTest
 {
@@ -40,7 +41,9 @@ public void TestCommaPolicy()
                     m = eval(p.rule)
                 """
             ), adapter);
-            enforcer.AddFunction("equal", (a1, a2) => a1 == a2);
+
+            enforcer.AddFunction<Func<object, object, bool>>("equal", (a1, a2) => a1 == a2);
+//            enforcer.AddFunction("equal", (a1, a2) => a1 == a2);
 
             enforcer.AddPolicy("equal(p.a1, p.a2)", "a1", "a1");
             Assert.True(enforcer.Enforce("_"));
diff --git a/Casbin.Persist.Adapter.EFCore/Casbin.Persist.Adapter.EFCore.csproj b/Casbin.Persist.Adapter.EFCore/Casbin.Persist.Adapter.EFCore.csproj
index 5737227..1df76e6 100644
--- a/Casbin.Persist.Adapter.EFCore/Casbin.Persist.Adapter.EFCore.csproj
+++ b/Casbin.Persist.Adapter.EFCore/Casbin.Persist.Adapter.EFCore.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Casbin.NET" Version="2.7.0" />
+    <PackageReference Include="Casbin.NET" Version="2.16.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
diff --git a/Casbin.Persist.Adapter.EFCore/DefaultPersistPolicyEntityTypeConfiguration.cs b/Casbin.Persist.Adapter.EFCore/DefaultPersistPolicyEntityTypeConfiguration.cs
index cd29bd0..9d41921 100644
--- a/Casbin.Persist.Adapter.EFCore/DefaultPersistPolicyEntityTypeConfiguration.cs
+++ b/Casbin.Persist.Adapter.EFCore/DefaultPersistPolicyEntityTypeConfiguration.cs
@@ -34,6 +34,8 @@ public virtual void Configure(EntityTypeBuilder<EFCorePersistPolicy<TKey>> build
             builder.Ignore(p => p.Value10);
             builder.Ignore(p => p.Value11);
             builder.Ignore(p => p.Value12);
+            builder.Ignore(p => p.Value13);
+            builder.Ignore(p => p.Value14);
 
             builder.HasIndex(p => p.Type);
             builder.HasIndex(p => p.Value1);

From 21108f2a718c3c221bba5eed1dea188138447153 Mon Sep 17 00:00:00 2001
From: Stewart McGuire <stewart.mcguire@arcadis.com>
Date: Fri, 3 Oct 2025 09:15:53 -0600
Subject: [PATCH 2/2] Removed commented out line.

---
 Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs b/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
index f30d730..f5f098a 100644
--- a/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
+++ b/Casbin.Persist.Adapter.EFCore.UnitTest/SpecialPolicyTest.cs
@@ -43,7 +43,6 @@ public void TestCommaPolicy()
             ), adapter);
 
             enforcer.AddFunction<Func<object, object, bool>>("equal", (a1, a2) => a1 == a2);
-//            enforcer.AddFunction("equal", (a1, a2) => a1 == a2);
 
             enforcer.AddPolicy("equal(p.a1, p.a2)", "a1", "a1");
             Assert.True(enforcer.Enforce("_"));