diff --git a/RAIC.Extensions.Configuration.EntityFrameworkCore/EntityFrameworkCoreDbSetConfigurationProvider.cs b/RAIC.Extensions.Configuration.EntityFrameworkCore/EntityFrameworkCoreDbSetConfigurationProvider.cs index c55954f..02fc651 100644 --- a/RAIC.Extensions.Configuration.EntityFrameworkCore/EntityFrameworkCoreDbSetConfigurationProvider.cs +++ b/RAIC.Extensions.Configuration.EntityFrameworkCore/EntityFrameworkCoreDbSetConfigurationProvider.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -17,9 +16,9 @@ internal interface IEntityFrameworkCoreDbSetConfigurationProvider : IConfigurati internal class EntityFrameworkCoreDbSetConfigurationProvider : ConfigurationProvider, IEntityFrameworkCoreDbSetConfigurationProvider where TDbContext : DbContext, ISettingsDbContext> { - private readonly IEntityFrameworkCoreDbSetConfigurationSource _configurationSource; + private readonly EntityFrameworkCoreDbSetConfigurationSource _configurationSource; - internal EntityFrameworkCoreDbSetConfigurationProvider(IEntityFrameworkCoreDbSetConfigurationSource configurationSource) : base() + internal EntityFrameworkCoreDbSetConfigurationProvider(EntityFrameworkCoreDbSetConfigurationSource configurationSource) : base() { _configurationSource = configurationSource; } @@ -35,15 +34,11 @@ internal class EntityFrameworkCoreDbSetConfigurationProvider : Confi public new void OnReload() => base.OnReload(); } -internal interface IEntityFrameworkCoreDbSetConfigurationSource where TDbContext : DbContext -{ - internal Func DbContextFactory { get; } -} -internal class EntityFrameworkCoreDbSetConfigurationSource : IConfigurationSource, IEntityFrameworkCoreDbSetConfigurationSource +internal class EntityFrameworkCoreDbSetConfigurationSource : IConfigurationSource where TDbContext : DbContext, ISettingsDbContext> { - public required Func DbContextFactory { get; init; } + public required System.Func DbContextFactory { get; init; } public IConfigurationProvider Build(IConfigurationBuilder builder) { diff --git a/RAIC.Extensions.Configuration.EntityFrameworkCore/ISettingsDbContext.cs b/RAIC.Extensions.Configuration.EntityFrameworkCore/ISettingsDbContext.cs index b00a7e1..1331463 100644 --- a/RAIC.Extensions.Configuration.EntityFrameworkCore/ISettingsDbContext.cs +++ b/RAIC.Extensions.Configuration.EntityFrameworkCore/ISettingsDbContext.cs @@ -1,10 +1,9 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; namespace RAIC.Extensions.Configuration.EntityFrameworkCore; -public interface ISettingsDbContext : IDisposable +public interface ISettingsDbContext : System.IDisposable where TSettings : System.Linq.IQueryable { TSettings Settings { get; }