From 422c01a13cd2d69202cb2d4f98e4150cbd117a4f Mon Sep 17 00:00:00 2001 From: iatsuta Date: Thu, 25 Dec 2025 14:59:00 +0100 Subject: [PATCH] upd libs --- src/Directory.Packages.props | 4 ++-- .../GenericQueryableOptionsExtension.cs | 9 +++++---- src/GenericQueryable.IntegrationTests/MainTests.cs | 1 + .../DependencyInjection/GenericQueryableSetup.cs | 6 ++++-- src/__SolutionItems/CommonAssemblyInfo.cs | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index aee06cd..4fe90ae 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -3,8 +3,8 @@ true - - + + diff --git a/src/GenericQueryable.EntityFramework/GenericQueryableOptionsExtension.cs b/src/GenericQueryable.EntityFramework/GenericQueryableOptionsExtension.cs index beee118..0dce99f 100644 --- a/src/GenericQueryable.EntityFramework/GenericQueryableOptionsExtension.cs +++ b/src/GenericQueryable.EntityFramework/GenericQueryableOptionsExtension.cs @@ -1,9 +1,10 @@ -using GenericQueryable.DependencyInjection; +using CommonFramework.DependencyInjection; + +using GenericQueryable.DependencyInjection; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Query; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; namespace GenericQueryable.EntityFramework; @@ -20,8 +21,8 @@ public void ApplyServices(IServiceCollection services) { services.AddGenericQueryable(v => v.SetFetchService().SetTargetMethodExtractor()); - services.Replace(ServiceDescriptor.Scoped()); - } + services.ReplaceScoped(); + } public void Validate(IDbContextOptions options) { diff --git a/src/GenericQueryable.IntegrationTests/MainTests.cs b/src/GenericQueryable.IntegrationTests/MainTests.cs index 1378f4f..add4fc8 100644 --- a/src/GenericQueryable.IntegrationTests/MainTests.cs +++ b/src/GenericQueryable.IntegrationTests/MainTests.cs @@ -1,4 +1,5 @@ using CommonFramework.DependencyInjection; + using GenericQueryable.EntityFramework; using GenericQueryable.IntegrationTests.Domain; diff --git a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs index 6c1e220..d045c62 100644 --- a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs +++ b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs @@ -20,14 +20,16 @@ public void Initialize(IServiceCollection services) services.AddSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType); } - public IGenericQueryableSetup SetFetchService() where TFetchService : IFetchService + public IGenericQueryableSetup SetFetchService() + where TFetchService : IFetchService { this.fetchServiceType = typeof(TFetchService); return this; } - public IGenericQueryableSetup SetTargetMethodExtractor() where TTargetMethodExtractor : ITargetMethodExtractor + public IGenericQueryableSetup SetTargetMethodExtractor() + where TTargetMethodExtractor : ITargetMethodExtractor { this.targetMethodExtractorType = typeof(TTargetMethodExtractor); diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs index c35db41..d4bbf69 100644 --- a/src/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/__SolutionItems/CommonAssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyProduct("GenericQueryable")] [assembly: AssemblyCompany("IvAt")] -[assembly: AssemblyVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.3.0")] [assembly: AssemblyInformationalVersion("changes at build")] #if DEBUG