Update package for net9.0 and version 2.1.0

- Added net9.0 to target frameworks.
- Updated package description to reference DigitalData.Core.Application.
- Incremented version to 2.1.0 for package, assembly, and file versions.
- Changed package icon path to `..\Assets\core_icon.png`.

DigitalData.Core.Abstractions/DigitalData.Core.Abstractions.csproj

@@ -9,7 +9,7 @@
 		<Authors>Digital Data GmbH</Authors>
 		<Company>Digital Data GmbH</Company>
 		<Product>DigitalData.Core.Abstractions</Product>
-		<Description>This package contains abstractions for the DigitalData.Core library, developed according to the principles of Clean Architecture. It promotes separation of concerns and enables independent core logic.</Description>
+		<Description>This package contains abstractions for the DigitalData.Core library.</Description>
 		<PackageTags>digital data core abstractions clean architecture</PackageTags>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Copyright>Copyright 2024</Copyright>
@@ -17,9 +17,9 @@
 		<RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
 		<PackAsTool>False</PackAsTool>
 		<PackageIcon>core_icon.png</PackageIcon>
-		<Version>3.6.0</Version>
+		<Version>4.0.0</Version>
-		<AssemblyVersion>3.6.0</AssemblyVersion>
+		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<FileVersion>3.6.0</FileVersion>
+		<FileVersion>4.0.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -29,12 +29,19 @@
 	  </None>
 	</ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
       <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
+    </ItemGroup>
-		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
+	
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+    </ItemGroup>
+	
+    <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.5" />
     </ItemGroup>
 
 </Project>

DigitalData.Core.Application/DigitalData.Core.Application.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Description>This package provides implementations for application services within the DigitalData.Core.Abstractions library. It includes generic CRUD operations using Entity Framework Core, AutoMapper integration for object mapping, and additional services such as JWT handling and directory search functionality, adhering to Clean Architecture principles to ensure separation of concerns and maintainability.</Description>
+    <Description>This package includes generic CRUD operations using Entity Framework Core, AutoMapper integration for object mapping, and additional services such as JWT handling and directory search functionality, adhering to Clean Architecture principles.</Description>
     <PackageId>DigitalData.Core.Application</PackageId>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
@@ -14,13 +14,13 @@
     <PackageIcon>core_icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <PackageTags>digital data core application clean architecture</PackageTags>
-    <Version>3.2.1</Version>
+    <Version>3.3.0</Version>
-    <AssemblyVersion>3.2.1</AssemblyVersion>
+    <AssemblyVersion>3.3.0</AssemblyVersion>
-    <FileVersion>3.2.1</FileVersion>
+    <FileVersion>3.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\nuget-package-icons\core_icon.png">
+    <None Include="..\Assets\core_icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>

DigitalData.Core.Application/Interfaces/Repository/ICRUDRepository.cs

@@ -5,6 +5,7 @@
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity this repository works with.</typeparam>
     /// <typeparam name="TId">The type of the identifier for the entity.</typeparam>
+    [Obsolete("Use IRepository")]
     public interface ICRUDRepository<TEntity, TId> where TEntity : class
     {
         /// <summary>

DigitalData.Core.Application/Interfaces/Repository/IReadQuery.cs

@@ -21,32 +21,37 @@ public interface IReadQuery<TEntity>
     /// <summary>
     /// Asynchronously retrieves the first entity or a default value if no entity is found.
     /// </summary>
+    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
-    public Task<TEntity?> FirstOrDefaultAsync();
+    public Task<TEntity?> FirstOrDefaultAsync(CancellationToken cancellation = default);
 
     /// <summary>
     /// Asynchronously retrieves a single entity or a default value if no entity is found.
     /// </summary>
+    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
-    public Task<TEntity?> SingleOrDefaultAsync();
+    public Task<TEntity?> SingleOrDefaultAsync(CancellationToken cancellation = default);
 
     /// <summary>
     /// Asynchronously retrieves a list of entities.
     /// </summary>
+    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the list of entities.</returns>
-    public Task<IEnumerable<TEntity>> ToListAsync();
+    public Task<IEnumerable<TEntity>> ToListAsync(CancellationToken cancellation = default);
 
     /// <summary>
     /// Asynchronously retrieves the first entity. Throws an exception if no entity is found.
     /// </summary>
+    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the first entity.</returns>
-    public Task<TEntity> FirstAsync();
+    public Task<TEntity> FirstAsync(CancellationToken cancellation = default);
 
     /// <summary>
     /// Asynchronously retrieves a single entity. Throws an exception if no entity is found.
     /// </summary>
+    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the single entity.</returns>
-    public Task<TEntity> SingleAsync();
+    public Task<TEntity> SingleAsync(CancellationToken cancellation = default);
 
     /// <summary>
     /// Synchronously retrieves the first entity or a default value if no entity is found.

DigitalData.Core.Application/Interfaces/Repository/IRepository.cs

@@ -6,25 +6,27 @@ public interface IRepository<TEntity>
 {
     public IEntityMapper<TEntity> Mapper { get; }
 
-    public Task<TEntity> CreateAsync(TEntity entity, CancellationToken ct = default);
+    public Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancellation = default);
 
-    public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken ct = default);
+    public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancellation = default);
 
-    public IReadQuery<TEntity> Read(Expression<Func<TEntity, bool>> expression, CancellationToken ct = default);
+    public IReadQuery<TEntity> Read(params Expression<Func<TEntity, bool>>[] expressions);
 
-    public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default);
+    public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
 
-    public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken ct = default);
+    public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
+
+    #region Obsolete
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken cancellation = default);
 
     [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default);
+    public Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken cancellation = default);
 
     [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default);
+    public Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken cancellation = default);
 
     [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default);
+    public Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken cancellation = default);
-
+    #endregion
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default);
 }

DigitalData.Core.Application/Interfaces/Repository/RepositoryExtensions.cs

@@ -0,0 +1,14 @@
+using System.Linq.Expressions;
+
+namespace DigitalData.Core.Application.Interfaces.Repository;
+
+public static class RepositoryExtensions
+{
+    public static IReadQuery<TEntity> Where<TEntity>(this IReadQuery<TEntity> query, params Expression<Func<TEntity, bool>>[] expressions)
+    {
+        foreach (var expression in expressions)
+            query = query.Where(expression);
+
+        return query;
+    }
+}

DigitalData.Core.Infrastructure/CRUDRepository.cs

@@ -15,6 +15,7 @@ namespace DigitalData.Core.Infrastructure
     /// This repository abstracts the common database operations, offering an asynchronous API to work with the entity's data.
     /// It leverages the EF Core's DbContext and DbSet to perform these operations.
     /// </remarks>
+    [Obsolete("Use Repository")]
     public class CRUDRepository<TEntity, TId, TDbContext> : ICRUDRepository<TEntity, TId>
         where TEntity : class
         where TDbContext : DbContext

DigitalData.Core.Infrastructure/DbRepository.cs

@@ -33,24 +33,7 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
         return entities;
     }
 
-    public virtual async Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
+    public IReadQuery<TEntity> Read(params Expression<Func<TEntity, bool>>[] expressions) => new ReadQuery<TEntity>(Entities.AsNoTracking()).Where(expressions);
-        => expression is null
-            ? await Entities.AsNoTracking().ToListAsync(ct)
-            : await Entities.AsNoTracking().Where(expression).ToListAsync(ct);
-
-    public virtual async Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
-        => single 
-            ? await Entities.AsNoTracking().Where(expression).SingleOrDefaultAsync(ct)
-            : await Entities.AsNoTracking().Where(expression).FirstOrDefaultAsync(ct);
-
-    public virtual async Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
-        => Mapper.Map<TDto>(await ReadAllAsync(expression, ct));
-
-    public virtual async Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
-    {
-        var entity = await ReadOrDefaultAsync(expression, single, ct);
-        return entity is null ? default : Mapper.Map<TDto>(entity);
-    }
     
     public virtual async Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
     {
@@ -76,4 +59,29 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
 
         await Context.SaveChangesAsync(ct);
     }
+
+    #region Obsolete
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public virtual async Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
+        => expression is null
+            ? await Entities.AsNoTracking().ToListAsync(ct)
+            : await Entities.AsNoTracking().Where(expression).ToListAsync(ct);
+
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public virtual async Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
+        => single
+            ? await Entities.AsNoTracking().Where(expression).SingleOrDefaultAsync(ct)
+            : await Entities.AsNoTracking().Where(expression).FirstOrDefaultAsync(ct);
+
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public virtual async Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
+        => Mapper.Map<TDto>(await ReadAllAsync(expression, ct));
+
+    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+    public virtual async Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
+    {
+        var entity = await ReadOrDefaultAsync(expression, single, ct);
+        return entity is null ? default : Mapper.Map<TDto>(entity);
+    }
+    #endregion
 }

DigitalData.Core.Infrastructure/DigitalData.Core.Infrastructure.csproj

@@ -6,22 +6,22 @@
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>DigitalData.Core.Infrastructure</PackageId>
-    <Version>2.0.4</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>DigitalData.Core.Infrastructure</Product>
-    <Description>This package provides implementations for data access and other low-level services within the DigitalData.Core.Abstractions library. It includes generic CRUD operations using Entity Framework Core, database context management, and other infrastructure-related functionalities, adhering to Clean Architecture principles to ensure separation of concerns and maintainability.</Description>
+    <Description>This package provides implementations for data access and other low-level services within the DigitalData.Core.Application library. It includes generic CRUD operations using Entity Framework Core, database context management, and other infrastructure-related functionalities, adhering to Clean Architecture principles.</Description>
     <Copyright>Copyright 2024</Copyright>
     <PackageIcon>core_icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <RepositoryType>digital data core abstractions clean architecture</RepositoryType>
     <PackageTags>digital data core infrastructure clean architecture</PackageTags>
-    <AssemblyVersion>2.0.4</AssemblyVersion>
+    <Version>2.1.0</Version>
-    <FileVersion>2.0.4</FileVersion>
+    <AssemblyVersion>2.1.0</AssemblyVersion>
+    <FileVersion>2.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\nuget-package-icons\core_icon.png">
+    <None Include="..\Assets\core_icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>

DigitalData.Core.Infrastructure/ReadQuery.cs

@@ -0,0 +1,48 @@
+using DigitalData.Core.Application.Interfaces.Repository;
+using Microsoft.EntityFrameworkCore;
+using System.Linq.Expressions;
+
+namespace DigitalData.Core.Infrastructure;
+
+public sealed record ReadQuery<TEntity> : IReadQuery<TEntity>
+{
+    private IQueryable<TEntity> _query;
+
+    internal ReadQuery(IQueryable<TEntity> queryable)
+    {
+        _query = queryable;
+    }
+
+    public TEntity First() => _query.First();
+
+    public Task<TEntity> FirstAsync(CancellationToken cancellation = default) => _query.FirstAsync(cancellation);
+
+    public TEntity? FirstOrDefault() => _query.FirstOrDefault();
+
+
+    public Task<TEntity?> FirstOrDefaultAsync(CancellationToken cancellation = default) => _query.FirstOrDefaultAsync(cancellation);
+
+
+    public TEntity Single() => _query.Single();
+
+
+    public Task<TEntity> SingleAsync(CancellationToken cancellation = default) => _query.SingleAsync(cancellation);
+
+
+    public TEntity? SingleOrDefault() => _query.SingleOrDefault();
+
+
+    public Task<TEntity?> SingleOrDefaultAsync(CancellationToken cancellation = default) => _query.SingleOrDefaultAsync(cancellation);
+
+
+    public IEnumerable<TEntity> ToList() => _query.ToList();
+
+
+    public async Task<IEnumerable<TEntity>> ToListAsync(CancellationToken cancellation = default) => await _query.ToListAsync(cancellation);
+
+    public IReadQuery<TEntity> Where(Expression<Func<TEntity, bool>> expression)
+    {
+        _query = _query.Where(expression);
+        return this;
+    }
+}