From abd51e6fb99a668e0a697ed5c957f85db8208f1a Mon Sep 17 00:00:00 2001
From: Jonathan Lydall <jonathan.lydall@intentarchitect.com>
Date: Fri, 20 Sep 2024 10:20:23 +0200
Subject: [PATCH] Improvement: Updated to respect new Stored Procedure
 stereotypes introduced in version `1.1.1` of the
 `Intent.Modelers.Domain.StoredProcedures` module.

(Tests)
---
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/Ardalis/modules.config                  |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/AzureKeyVault/modules.config            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/CleanArchitecture.Dapr/modules.config   |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/DtoSettings.Class.Init/modules.config   |  2 +-
 .../DtoSettings.Class.Internal/modules.config |  2 +-
 .../DtoSettings.Class.Private/modules.config  |  2 +-
 .../modules.config                            |  2 +-
 Tests/DtoSettings.Record.Init/modules.config  |  2 +-
 .../modules.config                            |  2 +-
 .../DtoSettings.Record.Private/modules.config |  2 +-
 .../modules.config                            |  2 +-
 .../DtoSettings.Record.Public/modules.config  |  2 +-
 .../EFCore.Lazy.Loading.Tests/modules.config  |  2 +-
 .../EfCore.SecondLevelCaching/modules.config  |  2 +-
 .../modules.config                            |  2 +-
 Tests/Entities.Interfaces.EF/modules.config   |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../EntityFrameworkCore.MySql/modules.config  |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../IStoredProcOperationsRepository.cs        | 16 +++
 .../DependencyInjection.cs                    |  1 +
 .../StoredProcOperationsRepository.cs         | 47 +++++++++
 .../InheritedContract__4lh1v98w.xml           |  2 +-
 .../StoredProcOperations__f45xh203.xml        | 97 +++++++++++++++++++
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/IntegrationTesting.Tests/modules.config |  2 +-
 Tests/Kafka.Consumer/modules.config           |  2 +-
 Tests/Kafka.Producer/modules.config           |  2 +-
 .../modules.config                            |  2 +-
 Tests/MassTransit.RabbitMQ/modules.config     |  2 +-
 .../MassTransitFinbuckle.Test/modules.config  |  2 +-
 Tests/MinimalHostingModel/modules.config      |  2 +-
 Tests/OpenApiImporterTest/modules.config      |  2 +-
 Tests/OutputCachingRedis.Tests/modules.config |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/RichDomain/modules.config               |  2 +-
 Tests/SecurityConfig.Tests/modules.config     |  2 +-
 Tests/SignalR/modules.config                  |  2 +-
 Tests/Solace.Tests/modules.config             |  2 +-
 Tests/SqlServerImporterTests/modules.config   |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 Tests/TableStorage.Tests/modules.config       |  2 +-
 Tests/TrainingModel.Tests/modules.config      |  2 +-
 Tests/ValueObjects.Class/modules.config       |  2 +-
 Tests/ValueObjects.Record/modules.config      |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 .../modules.config                            |  2 +-
 90 files changed, 247 insertions(+), 86 deletions(-)
 create mode 100644 Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Domain/Repositories/IStoredProcOperationsRepository.cs
 create mode 100644 Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/Repositories/StoredProcOperationsRepository.cs
 create mode 100644 Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Repository/StoredProcOperations__f45xh203.xml

diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config b/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
index af91d0667a..4bca9efa6a 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
@@ -40,7 +40,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/AdvancedMappingCrud.RichDomain.SeparatedEntityState.Tests/modules.config b/Tests/AdvancedMappingCrud.RichDomain.SeparatedEntityState.Tests/modules.config
index 786f77602b..a583c75d4d 100644
--- a/Tests/AdvancedMappingCrud.RichDomain.SeparatedEntityState.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.RichDomain.SeparatedEntityState.Tests/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/AdvancedMappingCrud.RichDomain.ServiceModel.Tests/modules.config b/Tests/AdvancedMappingCrud.RichDomain.ServiceModel.Tests/modules.config
index 786f77602b..a583c75d4d 100644
--- a/Tests/AdvancedMappingCrud.RichDomain.ServiceModel.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.RichDomain.ServiceModel.Tests/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/AdvancedMappingCrud.RichDomain.Tests/modules.config b/Tests/AdvancedMappingCrud.RichDomain.Tests/modules.config
index 786f77602b..a583c75d4d 100644
--- a/Tests/AdvancedMappingCrud.RichDomain.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.RichDomain.Tests/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Application.Identity.AccountController.UserIdentity/modules.config b/Tests/Application.Identity.AccountController.UserIdentity/modules.config
index 61a84fd364..d0441d0644 100644
--- a/Tests/Application.Identity.AccountController.UserIdentity/modules.config
+++ b/Tests/Application.Identity.AccountController.UserIdentity/modules.config
@@ -17,7 +17,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/Application.Identity.AccountController/modules.config b/Tests/Application.Identity.AccountController/modules.config
index 6b7db48c13..478e09067e 100644
--- a/Tests/Application.Identity.AccountController/modules.config
+++ b/Tests/Application.Identity.AccountController/modules.config
@@ -25,7 +25,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Ardalis/modules.config b/Tests/Ardalis/modules.config
index f09b461744..ddfc16264c 100644
--- a/Tests/Ardalis/modules.config
+++ b/Tests/Ardalis/modules.config
@@ -31,7 +31,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/AspNetCore.Controllers.Secured/modules.config b/Tests/AspNetCore.Controllers.Secured/modules.config
index ffe3da8fbc..f0e7651ce1 100644
--- a/Tests/AspNetCore.Controllers.Secured/modules.config
+++ b/Tests/AspNetCore.Controllers.Secured/modules.config
@@ -30,7 +30,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/AzureFunctions.TestApplication/modules.config b/Tests/AzureFunctions.TestApplication/modules.config
index 353835611e..9e853409ac 100644
--- a/Tests/AzureFunctions.TestApplication/modules.config
+++ b/Tests/AzureFunctions.TestApplication/modules.config
@@ -31,7 +31,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.DesignTimeDbContextFactory" version="4.2.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/AzureKeyVault/modules.config b/Tests/AzureKeyVault/modules.config
index 8e5d51fcdc..f9072c239f 100644
--- a/Tests/AzureKeyVault/modules.config
+++ b/Tests/AzureKeyVault/modules.config
@@ -26,7 +26,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/BasicAuditing.CustomUserId.Tests/modules.config b/Tests/BasicAuditing.CustomUserId.Tests/modules.config
index 3d8011f238..ecfa530eca 100644
--- a/Tests/BasicAuditing.CustomUserId.Tests/modules.config
+++ b/Tests/BasicAuditing.CustomUserId.Tests/modules.config
@@ -36,7 +36,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/CleanArchitecture.Comprehensive/modules.config b/Tests/CleanArchitecture.Comprehensive/modules.config
index f6d101dac0..32afe1f1ec 100644
--- a/Tests/CleanArchitecture.Comprehensive/modules.config
+++ b/Tests/CleanArchitecture.Comprehensive/modules.config
@@ -44,7 +44,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/CleanArchitecture.Dapr/modules.config b/Tests/CleanArchitecture.Dapr/modules.config
index 0de5043191..52f90ade2b 100644
--- a/Tests/CleanArchitecture.Dapr/modules.config
+++ b/Tests/CleanArchitecture.Dapr/modules.config
@@ -38,7 +38,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config b/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
index a88bc1c296..4158a0fc97 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
@@ -36,7 +36,7 @@
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.BulkOperations" version="1.0.2" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config b/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
index b2b882498e..2de4d23eb9 100644
--- a/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
+++ b/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/CleanArchitecture.SingleFiles/modules.config b/Tests/CleanArchitecture.SingleFiles/modules.config
index 9f1050eba9..4d577350e8 100644
--- a/Tests/CleanArchitecture.SingleFiles/modules.config
+++ b/Tests/CleanArchitecture.SingleFiles/modules.config
@@ -39,7 +39,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Class.Init/modules.config b/Tests/DtoSettings.Class.Init/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Class.Init/modules.config
+++ b/Tests/DtoSettings.Class.Init/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Class.Internal/modules.config b/Tests/DtoSettings.Class.Internal/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Class.Internal/modules.config
+++ b/Tests/DtoSettings.Class.Internal/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Class.Private/modules.config b/Tests/DtoSettings.Class.Private/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Class.Private/modules.config
+++ b/Tests/DtoSettings.Class.Private/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Class.Protected/modules.config b/Tests/DtoSettings.Class.Protected/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Class.Protected/modules.config
+++ b/Tests/DtoSettings.Class.Protected/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Record.Init/modules.config b/Tests/DtoSettings.Record.Init/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Record.Init/modules.config
+++ b/Tests/DtoSettings.Record.Init/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Record.Internal/modules.config b/Tests/DtoSettings.Record.Internal/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Record.Internal/modules.config
+++ b/Tests/DtoSettings.Record.Internal/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Record.Private/modules.config b/Tests/DtoSettings.Record.Private/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Record.Private/modules.config
+++ b/Tests/DtoSettings.Record.Private/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Record.Protected/modules.config b/Tests/DtoSettings.Record.Protected/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Record.Protected/modules.config
+++ b/Tests/DtoSettings.Record.Protected/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/DtoSettings.Record.Public/modules.config b/Tests/DtoSettings.Record.Public/modules.config
index b25841a135..26deca9063 100644
--- a/Tests/DtoSettings.Record.Public/modules.config
+++ b/Tests/DtoSettings.Record.Public/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/EFCore.Lazy.Loading.Tests/modules.config b/Tests/EFCore.Lazy.Loading.Tests/modules.config
index f5ab9dc7d3..92eabd0098 100644
--- a/Tests/EFCore.Lazy.Loading.Tests/modules.config
+++ b/Tests/EFCore.Lazy.Loading.Tests/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EfCore.SecondLevelCaching/modules.config b/Tests/EfCore.SecondLevelCaching/modules.config
index 70be5a4b09..bc18d889c7 100644
--- a/Tests/EfCore.SecondLevelCaching/modules.config
+++ b/Tests/EfCore.SecondLevelCaching/modules.config
@@ -25,7 +25,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SecondLevelCaching" version="1.0.0-beta.2" supportedClientVersions="[4.1.0-beta.21,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Entities.Constants.TestApplication/modules.config b/Tests/Entities.Constants.TestApplication/modules.config
index 1627f4c5f6..5d0de1b371 100644
--- a/Tests/Entities.Constants.TestApplication/modules.config
+++ b/Tests/Entities.Constants.TestApplication/modules.config
@@ -28,7 +28,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Entities.Interfaces.EF/modules.config b/Tests/Entities.Interfaces.EF/modules.config
index 506bfdca25..6514d1f2da 100644
--- a/Tests/Entities.Interfaces.EF/modules.config
+++ b/Tests/Entities.Interfaces.EF/modules.config
@@ -23,7 +23,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config b/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
index 6e8511e0d5..f388d2b594 100644
--- a/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
+++ b/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
@@ -18,7 +18,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config b/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
index f6610b6c3a..c5ac447297 100644
--- a/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
+++ b/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
@@ -19,7 +19,7 @@
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.4" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Entities.PrivateSetters.TestApplication/modules.config b/Tests/Entities.PrivateSetters.TestApplication/modules.config
index 5f65dcc52b..2be04b9eb2 100644
--- a/Tests/Entities.PrivateSetters.TestApplication/modules.config
+++ b/Tests/Entities.PrivateSetters.TestApplication/modules.config
@@ -22,7 +22,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/EntityFramework.SynchronousRepositories/modules.config b/Tests/EntityFramework.SynchronousRepositories/modules.config
index f5ab9dc7d3..92eabd0098 100644
--- a/Tests/EntityFramework.SynchronousRepositories/modules.config
+++ b/Tests/EntityFramework.SynchronousRepositories/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config b/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
index 027bc98217..57f0ed3f29 100644
--- a/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
@@ -28,7 +28,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.MaintainColumnOrder.Tests/modules.config b/Tests/EntityFrameworkCore.MaintainColumnOrder.Tests/modules.config
index 6f6cfdf92c..9798faefc6 100644
--- a/Tests/EntityFrameworkCore.MaintainColumnOrder.Tests/modules.config
+++ b/Tests/EntityFrameworkCore.MaintainColumnOrder.Tests/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.MultiDbContext.DbContextInterface/modules.config b/Tests/EntityFrameworkCore.MultiDbContext.DbContextInterface/modules.config
index 9d41a8d324..f0d65661f8 100644
--- a/Tests/EntityFrameworkCore.MultiDbContext.DbContextInterface/modules.config
+++ b/Tests/EntityFrameworkCore.MultiDbContext.DbContextInterface/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.MultiDbContext.NoDefaultDbContext/modules.config b/Tests/EntityFrameworkCore.MultiDbContext.NoDefaultDbContext/modules.config
index 9d41a8d324..f0d65661f8 100644
--- a/Tests/EntityFrameworkCore.MultiDbContext.NoDefaultDbContext/modules.config
+++ b/Tests/EntityFrameworkCore.MultiDbContext.NoDefaultDbContext/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.MultiDbContext.WithDefaultDbContext/modules.config b/Tests/EntityFrameworkCore.MultiDbContext.WithDefaultDbContext/modules.config
index 27a2a6c066..9a1e194373 100644
--- a/Tests/EntityFrameworkCore.MultiDbContext.WithDefaultDbContext/modules.config
+++ b/Tests/EntityFrameworkCore.MultiDbContext.WithDefaultDbContext/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.MySql/modules.config b/Tests/EntityFrameworkCore.MySql/modules.config
index d77d4ee6ea..3d2cc31509 100644
--- a/Tests/EntityFrameworkCore.MySql/modules.config
+++ b/Tests/EntityFrameworkCore.MySql/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.4" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config b/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
index d98bd4e4c5..0d5c7a0fc0 100644
--- a/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.Postgres/modules.config b/Tests/EntityFrameworkCore.Postgres/modules.config
index d77d4ee6ea..3d2cc31509 100644
--- a/Tests/EntityFrameworkCore.Postgres/modules.config
+++ b/Tests/EntityFrameworkCore.Postgres/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.4" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Domain/Repositories/IStoredProcOperationsRepository.cs b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Domain/Repositories/IStoredProcOperationsRepository.cs
new file mode 100644
index 0000000000..2ec547fc0f
--- /dev/null
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Domain/Repositories/IStoredProcOperationsRepository.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Repositories.TestApplication.Domain.Contracts;
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.EntityFrameworkCore.Repositories.CustomRepositoryInterface", Version = "1.0")]
+
+namespace EntityFrameworkCore.Repositories.TestApplication.Domain.Repositories
+{
+    public interface IStoredProcOperationsRepository
+    {
+        Task<SpResult> MyProc(IEnumerable<SpParameter> param, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/DependencyInjection.cs b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/DependencyInjection.cs
index f20980bd8e..9aa8eb054b 100644
--- a/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/DependencyInjection.cs
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/DependencyInjection.cs
@@ -39,6 +39,7 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
             services.AddTransient<ISqlParameterRepositoryReturningScalarRepository, SqlParameterRepositoryReturningScalarRepository>();
             services.AddTransient<ISqlParameterRepositoryWithNameRepository, SqlParameterRepositoryWithNameRepository>();
             services.AddTransient<ISqlParameterRepositoryWithoutNameRepository, SqlParameterRepositoryWithoutNameRepository>();
+            services.AddTransient<IStoredProcOperationsRepository, StoredProcOperationsRepository>();
             services.AddTransient<IMappableStoredProcRepository, MappableStoredProcRepository>();
             services.AddTransient<IAggregateRoot1Repository, AggregateRoot1Repository>();
             services.AddTransient<IAggregateRoot2CompositionRepository, AggregateRoot2CompositionRepository>();
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/Repositories/StoredProcOperationsRepository.cs b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/Repositories/StoredProcOperationsRepository.cs
new file mode 100644
index 0000000000..1a8165833e
--- /dev/null
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/EntityFrameworkCore.Repositories.TestApplication.Infrastructure/Repositories/StoredProcOperationsRepository.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Repositories.TestApplication.Domain.Contracts;
+using EntityFrameworkCore.Repositories.TestApplication.Domain.Repositories;
+using EntityFrameworkCore.Repositories.TestApplication.Infrastructure.Persistence;
+using EntityFrameworkCore.Repositories.TestApplication.Infrastructure.Repositories.ExtensionMethods;
+using Intent.RoslynWeaver.Attributes;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.EntityFrameworkCore.Repositories.CustomRepository", Version = "1.0")]
+
+namespace EntityFrameworkCore.Repositories.TestApplication.Infrastructure.Repositories
+{
+    public class StoredProcOperationsRepository : IStoredProcOperationsRepository
+    {
+        private readonly ApplicationDbContext _dbContext;
+
+        public StoredProcOperationsRepository(ApplicationDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task<SpResult> MyProc(IEnumerable<SpParameter> param, CancellationToken cancellationToken = default)
+        {
+            var paramParameter = new SqlParameter
+            {
+                IsNullable = false,
+                SqlDbType = SqlDbType.Structured,
+                Value = param.ToDataTable(),
+                TypeName = "SpParameter"
+            };
+
+            var result = (await _dbContext.SpResults
+                .FromSqlInterpolated($"EXECUTE MyProc {paramParameter}")
+                .IgnoreQueryFilters()
+                .ToArrayAsync(cancellationToken))
+                .Single();
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Data Contract/InheritedContract__4lh1v98w.xml b/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Data Contract/InheritedContract__4lh1v98w.xml
index b56efd016e..21564a9b27 100644
--- a/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Data Contract/InheritedContract__4lh1v98w.xml	
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Data Contract/InheritedContract__4lh1v98w.xml	
@@ -2,7 +2,7 @@
 <class id="0c388142-4d87-4dad-b975-76a5314d4cf0" type="Data Contract" typeId="4464fabe-c59e-4d90-81fc-c9245bdd1afd">
   <comment>6070899024 - (For Trade Shield) Domain Data Objects don't generate base type captured in the designer</comment>
   <name>InheritedContract</name>
-  <display>InheritedContract</display>
+  <display>InheritedContract : BaseContract</display>
   <isAbstract>false</isAbstract>
   <genericTypes />
   <isMapped>false</isMapped>
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Repository/StoredProcOperations__f45xh203.xml b/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Repository/StoredProcOperations__f45xh203.xml
new file mode 100644
index 0000000000..b43587ba5b
--- /dev/null
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/Intent.Metadata/Domain/EntityFrameworkCore.Repositories.TestApplication.Domain/Elements/Repository/StoredProcOperations__f45xh203.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<class id="a5130ebe-8193-4498-be4f-83ae4a19f8f8" type="Repository" typeId="96ffceb2-a70a-4b69-869b-0df436c470c3">
+  <name>StoredProcOperations</name>
+  <display>StoredProcOperations</display>
+  <isAbstract>false</isAbstract>
+  <sort-children>manually</sort-children>
+  <genericTypes />
+  <typeReference id="d2e53902-a88c-4e2c-bd7a-94fb708c9076">
+    <isNavigable>true</isNavigable>
+    <isNullable>false</isNullable>
+    <isCollection>false</isCollection>
+    <isRequired>true</isRequired>
+    <stereotypes />
+    <genericTypeParameters />
+  </typeReference>
+  <isMapped>false</isMapped>
+  <parentFolderId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</parentFolderId>
+  <packageId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</packageId>
+  <packageName>EntityFrameworkCore.Repositories.TestApplication.Domain</packageName>
+  <stereotypes />
+  <metadata />
+  <childElements>
+    <childElement id="87802fb5-da4d-4185-88ca-606e5d6855b4" type="Operation" typeId="e042bb67-a1df-480c-9935-b26210f78591">
+      <name>MyProc</name>
+      <display>MyProc(param: SpParameter[*]): SpResult</display>
+      <isAbstract>false</isAbstract>
+      <sort-children>by-type-then-manually</sort-children>
+      <genericTypes />
+      <typeReference id="c5d36d92-7de6-44d6-8adc-8502133a05ad">
+        <typeId>ac220ea1-4718-4f07-986f-bc72141bb099</typeId>
+        <isNavigable>true</isNavigable>
+        <isNullable>false</isNullable>
+        <isCollection>false</isCollection>
+        <isRequired>true</isRequired>
+        <typePackageName>EntityFrameworkCore.Repositories.TestApplication.Domain</typePackageName>
+        <typePackageId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</typePackageId>
+        <stereotypes />
+        <genericTypeParameters />
+      </typeReference>
+      <isMapped>false</isMapped>
+      <parentFolderId>a5130ebe-8193-4498-be4f-83ae4a19f8f8</parentFolderId>
+      <packageId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</packageId>
+      <packageName>EntityFrameworkCore.Repositories.TestApplication.Domain</packageName>
+      <stereotypes>
+        <stereotype stereotypeDefinitionId="f40ff84c-68ad-405f-bda0-1237dd15fc92" name="Stored Procedure">
+          <addedByDefault>false</addedByDefault>
+          <definitionPackageName>Intent.Modules.Modelers.Domain.StoredProcedures</definitionPackageName>
+          <definitionPackageId>e3eb7873-c66f-4636-a7c8-8cb1f7b34d71</definitionPackageId>
+          <properties>
+            <property name="4e2a3f58-6b6e-43c5-9398-f9c3fde593f6" display="Name in Schema" isActive="true" />
+          </properties>
+        </stereotype>
+      </stereotypes>
+      <metadata />
+      <childElements>
+        <childElement id="1be57d7d-f8ff-4469-b640-91582c0c4ceb" type="Parameter" typeId="c26d8d0a-a26b-4b5f-b449-e9bdb60b3a4b">
+          <name>param</name>
+          <display>in : param: SpParameter[*]</display>
+          <isAbstract>false</isAbstract>
+          <genericTypes />
+          <typeReference id="2843d803-28b0-4076-b7a6-9b039d157522">
+            <typeId>bb0e978c-48ce-41eb-a41f-a9ea73ec2d05</typeId>
+            <isNavigable>true</isNavigable>
+            <isNullable>false</isNullable>
+            <isCollection>true</isCollection>
+            <isRequired>true</isRequired>
+            <typePackageName>EntityFrameworkCore.Repositories.TestApplication.Domain</typePackageName>
+            <typePackageId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</typePackageId>
+            <stereotypes />
+            <genericTypeParameters />
+          </typeReference>
+          <isMapped>false</isMapped>
+          <parentFolderId>87802fb5-da4d-4185-88ca-606e5d6855b4</parentFolderId>
+          <packageId>b3728b2a-36f7-45dc-b2d7-5301260b6b81</packageId>
+          <packageName>EntityFrameworkCore.Repositories.TestApplication.Domain</packageName>
+          <stereotypes>
+            <stereotype stereotypeDefinitionId="6ac91fd5-206c-49da-b4a2-b6ea2cad11f7" name="Stored Procedure Parameter Settings">
+              <addedByDefault>false</addedByDefault>
+              <definitionPackageName>Intent.Modules.Modelers.Domain.StoredProcedures</definitionPackageName>
+              <definitionPackageId>e3eb7873-c66f-4636-a7c8-8cb1f7b34d71</definitionPackageId>
+              <properties>
+                <property name="714a95a6-c3ef-4117-a66c-24876c675cd5" display="Name" value="sp_myParam" isActive="true" />
+                <property name="39491728-8327-4b94-b9a2-9851dd4b4a01" display="Direction" value="In" isActive="true" />
+                <property name="8ba486d3-853c-42b8-acfb-bafb1e2cdb6e" display="SQL String Type" value="VarChar" isActive="false" />
+                <property name="a2df34af-2fb9-49e3-ab6e-caff7a27bf99" display="Size" isActive="false" />
+                <property name="ed35ae5c-a708-457d-a22a-145b3b2f1148" display="Precision" isActive="false" />
+                <property name="38d3c607-ac3b-41ea-86b2-b43fa81e101c" display="Scale" isActive="false" />
+              </properties>
+            </stereotype>
+          </stereotypes>
+          <metadata />
+          <childElements />
+        </childElement>
+      </childElements>
+    </childElement>
+  </childElements>
+</class>
\ No newline at end of file
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config b/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
index 59d6bf6f5f..d769ebd81d 100644
--- a/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
@@ -27,7 +27,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config b/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
index 4b9e5d7d49..85e2c1812b 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
@@ -10,7 +10,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config b/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
index 4b9e5d7d49..85e2c1812b 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
@@ -10,7 +10,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config b/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
index 4b9e5d7d49..85e2c1812b 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
@@ -10,7 +10,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.SqlServer.EF7/modules.config b/Tests/EntityFrameworkCore.SqlServer.EF7/modules.config
index d77d4ee6ea..3d2cc31509 100644
--- a/Tests/EntityFrameworkCore.SqlServer.EF7/modules.config
+++ b/Tests/EntityFrameworkCore.SqlServer.EF7/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.4" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/EntityFrameworkCore.SqlServer.EF8/modules.config b/Tests/EntityFrameworkCore.SqlServer.EF8/modules.config
index d77d4ee6ea..3d2cc31509 100644
--- a/Tests/EntityFrameworkCore.SqlServer.EF8/modules.config
+++ b/Tests/EntityFrameworkCore.SqlServer.EF8/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.4" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.SoftDelete" version="1.0.3" supportedClientVersions="[3.4.0,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config b/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
index 68cd8984f3..aaeb4b7f0e 100644
--- a/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
+++ b/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
@@ -22,7 +22,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.DesignTimeDbContextFactory" version="4.2.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config b/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
index fa4ec5db32..16c3a9b39f 100644
--- a/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
+++ b/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
@@ -25,7 +25,7 @@
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.DesignTimeDbContextFactory" version="4.2.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/GraphQL.AzureFunction.TestApplication/modules.config b/Tests/GraphQL.AzureFunction.TestApplication/modules.config
index 13c225fd7d..8a93c4f240 100644
--- a/Tests/GraphQL.AzureFunction.TestApplication/modules.config
+++ b/Tests/GraphQL.AzureFunction.TestApplication/modules.config
@@ -29,7 +29,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.HotChocolate.GraphQL" version="4.0.6" supportedClientVersions="[4.0.0-beta.10, 5.0.0-a)" />
   <module moduleId="Intent.HotChocolate.GraphQL.AzureFunctions" version="1.0.2" supportedClientVersions="[4.1.0,5.0.0)" />
   <module moduleId="Intent.HotChocolate.GraphQL.Dispatch.MediatR" version="1.0.3" supportedClientVersions="[4.1.0,5.0.0)" />
diff --git a/Tests/IntegrationTesting.Tests/modules.config b/Tests/IntegrationTesting.Tests/modules.config
index 5b735a1d5b..7f7722d1ad 100644
--- a/Tests/IntegrationTesting.Tests/modules.config
+++ b/Tests/IntegrationTesting.Tests/modules.config
@@ -35,7 +35,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Kafka.Consumer/modules.config b/Tests/Kafka.Consumer/modules.config
index f35d525fe5..bf24738b0d 100644
--- a/Tests/Kafka.Consumer/modules.config
+++ b/Tests/Kafka.Consumer/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Kafka" version="1.0.0-beta.7" supportedClientVersions="[4.1.0-beta.21,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Kafka.Producer/modules.config b/Tests/Kafka.Producer/modules.config
index f35d525fe5..bf24738b0d 100644
--- a/Tests/Kafka.Producer/modules.config
+++ b/Tests/Kafka.Producer/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Kafka" version="1.0.0-beta.7" supportedClientVersions="[4.1.0-beta.21,5.0.0)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/MassTransit.AzureServiceBus/modules.config b/Tests/MassTransit.AzureServiceBus/modules.config
index 02c5150e42..f8e54141d3 100644
--- a/Tests/MassTransit.AzureServiceBus/modules.config
+++ b/Tests/MassTransit.AzureServiceBus/modules.config
@@ -29,7 +29,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/MassTransit.RabbitMQ/modules.config b/Tests/MassTransit.RabbitMQ/modules.config
index 02c5150e42..f8e54141d3 100644
--- a/Tests/MassTransit.RabbitMQ/modules.config
+++ b/Tests/MassTransit.RabbitMQ/modules.config
@@ -29,7 +29,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/MassTransitFinbuckle.Test/modules.config b/Tests/MassTransitFinbuckle.Test/modules.config
index 1c04d57f82..c3853285dd 100644
--- a/Tests/MassTransitFinbuckle.Test/modules.config
+++ b/Tests/MassTransitFinbuckle.Test/modules.config
@@ -36,7 +36,7 @@
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.DesignTimeDbContextFactory" version="4.2.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/MinimalHostingModel/modules.config b/Tests/MinimalHostingModel/modules.config
index f3094618a6..ce3bc6c0d8 100644
--- a/Tests/MinimalHostingModel/modules.config
+++ b/Tests/MinimalHostingModel/modules.config
@@ -45,7 +45,7 @@
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.DesignTimeDbContextFactory" version="4.2.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/OpenApiImporterTest/modules.config b/Tests/OpenApiImporterTest/modules.config
index 7ec0f552a2..74356dd649 100644
--- a/Tests/OpenApiImporterTest/modules.config
+++ b/Tests/OpenApiImporterTest/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/OutputCachingRedis.Tests/modules.config b/Tests/OutputCachingRedis.Tests/modules.config
index ae7f03aac3..1f6a6471a5 100644
--- a/Tests/OutputCachingRedis.Tests/modules.config
+++ b/Tests/OutputCachingRedis.Tests/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/ProxyServiceTests.OriginalServices/modules.config b/Tests/ProxyServiceTests.OriginalServices/modules.config
index c453f179ff..3be05c10e9 100644
--- a/Tests/ProxyServiceTests.OriginalServices/modules.config
+++ b/Tests/ProxyServiceTests.OriginalServices/modules.config
@@ -30,7 +30,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.WebApi" version="4.6.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
diff --git a/Tests/ProxyServiceTests.Proxy.AuthHeaderProvider/modules.config b/Tests/ProxyServiceTests.Proxy.AuthHeaderProvider/modules.config
index bbb8b0280c..c935bca16a 100644
--- a/Tests/ProxyServiceTests.Proxy.AuthHeaderProvider/modules.config
+++ b/Tests/ProxyServiceTests.Proxy.AuthHeaderProvider/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/ProxyServiceTests.Proxy.PassThruHeader/modules.config b/Tests/ProxyServiceTests.Proxy.PassThruHeader/modules.config
index 7a785a3bd9..521f5f9e1c 100644
--- a/Tests/ProxyServiceTests.Proxy.PassThruHeader/modules.config
+++ b/Tests/ProxyServiceTests.Proxy.PassThruHeader/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/ProxyServiceTests.Proxy.TokenMgmtSvc/modules.config b/Tests/ProxyServiceTests.Proxy.TokenMgmtSvc/modules.config
index 7a785a3bd9..521f5f9e1c 100644
--- a/Tests/ProxyServiceTests.Proxy.TokenMgmtSvc/modules.config
+++ b/Tests/ProxyServiceTests.Proxy.TokenMgmtSvc/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config b/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
index 6cefd3f905..b33825a07d 100644
--- a/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
+++ b/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
@@ -22,7 +22,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config b/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
index 485d2c046d..f871b1d049 100644
--- a/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
+++ b/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
@@ -22,7 +22,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config b/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
index 23329e4aa9..0b5780b4f9 100644
--- a/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
+++ b/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
@@ -28,7 +28,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config b/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
index ae7e1c8917..0ae8fdab2b 100644
--- a/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
+++ b/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
@@ -28,7 +28,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Publish.CleanArchDapr.TestApplication/modules.config b/Tests/Publish.CleanArchDapr.TestApplication/modules.config
index d2dba6c38b..8079710fae 100644
--- a/Tests/Publish.CleanArchDapr.TestApplication/modules.config
+++ b/Tests/Publish.CleanArchDapr.TestApplication/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/RichDomain/modules.config b/Tests/RichDomain/modules.config
index 3cd2dc5186..94ed369e3e 100644
--- a/Tests/RichDomain/modules.config
+++ b/Tests/RichDomain/modules.config
@@ -29,7 +29,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/SecurityConfig.Tests/modules.config b/Tests/SecurityConfig.Tests/modules.config
index bbb8b0280c..c935bca16a 100644
--- a/Tests/SecurityConfig.Tests/modules.config
+++ b/Tests/SecurityConfig.Tests/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
diff --git a/Tests/SignalR/modules.config b/Tests/SignalR/modules.config
index 31bc65075b..85f17f80a7 100644
--- a/Tests/SignalR/modules.config
+++ b/Tests/SignalR/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Solace.Tests/modules.config b/Tests/Solace.Tests/modules.config
index db4e545a6c..a2e8ec565d 100644
--- a/Tests/Solace.Tests/modules.config
+++ b/Tests/Solace.Tests/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Repositories.DapperHybrid" version="1.0.2" supportedClientVersions="[4.1.0-beta.21,5.0.0)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Solace" version="1.0.4" supportedClientVersions="[4.1.0-beta.21,5.0.0)" />
diff --git a/Tests/SqlServerImporterTests/modules.config b/Tests/SqlServerImporterTests/modules.config
index 4cd4998ec1..3ab51dfeb7 100644
--- a/Tests/SqlServerImporterTests/modules.config
+++ b/Tests/SqlServerImporterTests/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config b/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
index 62d70cd29e..42a5eb6823 100644
--- a/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
+++ b/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Standard.AspNetCore.TestApplication/modules.config b/Tests/Standard.AspNetCore.TestApplication/modules.config
index 4b0242d31b..efee2a74b8 100644
--- a/Tests/Standard.AspNetCore.TestApplication/modules.config
+++ b/Tests/Standard.AspNetCore.TestApplication/modules.config
@@ -25,7 +25,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Integration.HttpClients" version="5.2.0-pre.0" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config b/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
index d2dba6c38b..8079710fae 100644
--- a/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
+++ b/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
@@ -34,7 +34,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Subscribe.MassTransit.OutboxEF/modules.config b/Tests/Subscribe.MassTransit.OutboxEF/modules.config
index c56c77aaf8..803a087882 100644
--- a/Tests/Subscribe.MassTransit.OutboxEF/modules.config
+++ b/Tests/Subscribe.MassTransit.OutboxEF/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/Subscribe.MassTransit.OutboxMemory/modules.config b/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
index c56c77aaf8..803a087882 100644
--- a/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
+++ b/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
@@ -32,7 +32,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/TableStorage.Tests/modules.config b/Tests/TableStorage.Tests/modules.config
index 359622f4f0..b376dc9a95 100644
--- a/Tests/TableStorage.Tests/modules.config
+++ b/Tests/TableStorage.Tests/modules.config
@@ -35,7 +35,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/TrainingModel.Tests/modules.config b/Tests/TrainingModel.Tests/modules.config
index f1fe51df99..0707a6e06d 100644
--- a/Tests/TrainingModel.Tests/modules.config
+++ b/Tests/TrainingModel.Tests/modules.config
@@ -36,7 +36,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts" version="5.1.1" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.6" supportedClientVersions="[4.0.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Eventing.MassTransit" version="6.2.5" supportedClientVersions="[4.1.0, 5.0.0-a)" />
diff --git a/Tests/ValueObjects.Class/modules.config b/Tests/ValueObjects.Class/modules.config
index 40d618e186..2e613c8696 100644
--- a/Tests/ValueObjects.Class/modules.config
+++ b/Tests/ValueObjects.Class/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/ValueObjects.Record/modules.config b/Tests/ValueObjects.Record/modules.config
index 40d618e186..2e613c8696 100644
--- a/Tests/ValueObjects.Record/modules.config
+++ b/Tests/ValueObjects.Record/modules.config
@@ -33,7 +33,7 @@
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore.Interop.DomainEvents" version="4.1.1" supportedClientVersions="[4.1.0-pre.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.15" supportedClientVersions="[4.1.3-pre.2, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config b/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
index 613228f66a..894f54822b 100644
--- a/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
+++ b/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
@@ -23,7 +23,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config b/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
index e169ac0bc7..e01462257e 100644
--- a/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
+++ b/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
@@ -23,7 +23,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.2.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.6.2" supportedClientVersions="[4.0.0-beta.7, 5.0.0-a)" />
diff --git a/Tests/intent/GraphQL.CQRS.TestApplication/modules.config b/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
index 0eda7cbcb1..25c0618974 100644
--- a/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
+++ b/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
@@ -30,7 +30,7 @@
   <module moduleId="Intent.Entities" version="5.1.4-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.2" supportedClientVersions="[4.1.0, 5.0.0-a)" />
   <module moduleId="Intent.EntityFrameworkCore" version="5.0.12-pre.0" supportedClientVersions="[4.1.0, 5.0.0-a)" />
-  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.6.4-pre.2" supportedClientVersions="[4.2.4-a, 5.0.0-a)" />
+  <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.7.0-pre.3" supportedClientVersions="[4.3.0-a, 5.0.0-a)" />
   <module moduleId="Intent.HotChocolate.GraphQL" version="4.0.6" supportedClientVersions="[4.0.0-beta.10, 5.0.0-a)" />
   <module moduleId="Intent.HotChocolate.GraphQL.AspNetCore" version="5.0.5" supportedClientVersions="[4.2.4, 5.0.0-a)" />
   <module moduleId="Intent.HotChocolate.GraphQL.Dispatch.MediatR" version="1.0.3" supportedClientVersions="[4.1.0,5.0.0)" />