Update project file for version 3.0.2 release

- Changed SDK declaration to include a non-breaking Unicode character.
- Incremented version number from 3.0.1 to 3.0.2 for package and assembly.
- Updated copyright year to 2024.

DigitalData.UserManager.API/DigitalData.UserManager.API.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
-    <AssemblyVersion>6.0.0</AssemblyVersion>
+    <AssemblyVersion>6.0.1</AssemblyVersion>
-    <FileVersion>6.0.0</FileVersion>
+    <FileVersion>6.0.1</FileVersion>
+    <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,25 +26,15 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
-    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -51,6 +42,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="..\Assets\icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
     <None Include="wwwroot\assets\img\DD_white.svg" />
     <None Include="wwwroot\assets\img\digital_data.svg" />
     <None Include="wwwroot\assets\img\digital_data_red_BG.svg" />
@@ -64,4 +59,8 @@
     <None Include="wwwroot\media\bootstrap-icons-X6UQXWUS.woff2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.DependencyInjection\DigitalData.UserManager.DependencyInjection.csproj" />
+  </ItemGroup>
+
 </Project>

DigitalData.UserManager.API/Program.cs

@@ -19,6 +19,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Options;
 using DigitalData.Core.Abstractions.Security.Extensions;
 using Microsoft.OpenApi.Models;
+using DigitalData.UserManager.DependencyInjection;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Debug("init main");
@@ -30,9 +31,6 @@ try {
 
     builder.Services.AddEncryptor(builder.Configuration.GetSection("EncryptionParameters"));
 
-    if (builder.Configuration.GetValue<bool>("RunAsWindowsService"))
-        builder.Host.UseWindowsService();
-
     builder.Logging.ClearProviders();
     builder.Host.UseNLog();
 
@@ -72,7 +70,7 @@ try {
     // Once the app is built, the password will be decrypted with Encryptor. lazy loading also acts as a call back method.
     Lazy<string>? cnn_str = null;
 
-    builder.Services.AddDbContext<UserManagerDbContext>(options => options.UseSqlServer(cnn_str!.Value).EnableSensitiveDataLogging());
+    builder.Services.AddUserManager(options => options.UseSqlServer(cnn_str!.Value).EnableSensitiveDataLogging());
 
     var allowedOrigins = builder.Configuration.GetSection("AllowedOrigins").Get<string[]>() ?? throw new InvalidOperationException("In appsettings there is no allowed origin.");
 
@@ -88,9 +86,6 @@ try {
             });
     });
         
-    //builder.Services.AddAutoMapper(typeof(DirectoryMappingProfile).Assembly);
-    builder.Services.AddUserManager<UserManagerDbContext>();
-    
     builder.ConfigureBySection<DirectorySearchOptions>();
     builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
     builder.Services.AddJWTService<UserReadDto>(user => new SecurityTokenDescriptor()

DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IClientUserRepository : ICRUDRepository<ClientUser, int>
+{
+    Task<IEnumerable<ClientUser>> ReadAsync(bool readOnly = true, int? userId = null);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs

@@ -0,0 +1,27 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IGroupOfUserRepository : ICRUDRepository<GroupOfUser, int>
+{
+    IQueryable<GroupOfUser> ReadByGroupId(int groupId);
+
+    Task<IEnumerable<GroupOfUser>> ReadByGroupUserIdAsync(int groupId, int userId);
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup();
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser();
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
+
+    Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
+
+    Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId);
+
+    // merge all GroupOfUserRepository-methods conditionally under this method
+    Task<IEnumerable<GroupOfUser>> ReadAsync(
+        bool readOnly = true,
+        bool withGroup = true, bool withUser = true,
+        int? id = null, int? groupId = null, int? userId = null, string? username = null);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IGroupRepository : ICRUDRepository<Group, int>
+{
+}

DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IModuleOfUserRepository : ICRUDRepository<ModuleOfUser, int>
+{
+    IQueryable<ModuleOfUser> ReadByModuleId(int moduleId);
+
+    Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId);
+
+    Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IModuleRepository : ICRUDRepository<Module, int>
+{
+}

DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs

@@ -0,0 +1,11 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IUserRepRepository : ICRUDRepository<UserRep, int>
+{
+    Task<IEnumerable<UserRep>> ReadAllAsync(
+        bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
+        int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IUserRepository : ICRUDRepository<User, int>
+{
+    Task<IEnumerable<User>> ReadByModuleIdAsync(int moduleId);
+
+    Task<IEnumerable<User>> ReadUnassignedByModuleIdAsync(int moduleId);
+
+    Task<IEnumerable<User>> ReadByGroupIdAsync(int groupId);
+
+    Task<IEnumerable<User>> ReadUnassignedByGroupIdAsync(int groupId);
+
+    Task<User?> ReadByUsernameAsync(string username);
+}

DigitalData.UserManager.Application/DIExtensions.cs

@@ -2,9 +2,6 @@
 using DigitalData.UserManager.Application.MappingProfiles;
 using DigitalData.UserManager.Application.Services;
 using DigitalData.UserManager.Application.Services.Options;
-using DigitalData.UserManager.Infrastructure.Contracts;
-using DigitalData.UserManager.Infrastructure.Repositories;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -19,8 +16,7 @@ namespace DigitalData.UserManager.Application
         /// <typeparam name="TDbContext">The type of the DbContext to use for the repositories.</typeparam>
         /// <param name="services">The IServiceCollection to which the services will be added.</param>
         /// <returns>The updated IServiceCollection.</returns>
-        public static IServiceCollection AddUserManager<TDbContext>(this IServiceCollection services)
+        public static IServiceCollection AddUserManagerApplication(this IServiceCollection services)
-            where TDbContext : DbContext, IUserManagerDbContext
             => services
             .AddAutoMapper(typeof(UserMappingProfile).Assembly)
             .AddAutoMapper(typeof(GroupMappingProfile).Assembly)
@@ -29,14 +25,6 @@ namespace DigitalData.UserManager.Application
             .AddAutoMapper(typeof(ModuleOfUserMappingProfile).Assembly)
             .AddAutoMapper(typeof(UserRepMappingProfile).Assembly)
 
-            .AddScoped<IUserRepository, UserRepository<TDbContext>>()
-            .AddScoped<IGroupRepository, GroupRepository<TDbContext>>()
-            .AddScoped<IGroupOfUserRepository, GroupOfUserRepository<TDbContext>>()
-            .AddScoped<IModuleRepository, ModuleRepository<TDbContext>>()
-            .AddScoped<IModuleOfUserRepository, ModuleOfUserRepository<TDbContext>>()
-            .AddScoped<IUserRepRepository, UserRepRepository<TDbContext>>()
-            .AddScoped<IClientUserRepository, ClientUserRepository<TDbContext>>()
-
             .AddScoped<IUserService, UserService>()
             .AddScoped<IGroupService, GroupService>()
             .AddScoped<IGroupOfUserService, GroupOfUserService>()
@@ -44,16 +32,6 @@ namespace DigitalData.UserManager.Application
             .AddScoped<IModuleOfUserService, ModuleOfUserService>()
             .AddScoped<IUserRepService, UserRepService>();
         
-        /// <summary>
-        /// Adds the UserManager services and repositories to the specified <see cref="IServiceCollection"/>.
-        /// This method registers the necessary mappings, repositories, services and <see cref="UserManagerDbContext"/> for the UserManager.
-        /// </summary>
-        /// <param name="services">The IServiceCollection to which the services will be added.</param>
-        /// <returns>The updated IServiceCollection.</returns>
-        public static IServiceCollection AddUserManager(this IServiceCollection services, string connectionString)=> services
-            .AddDbContext<UserManagerDbContext>(options => options.UseSqlServer(connectionString).EnableSensitiveDataLogging())
-            .AddUserManager<UserManagerDbContext>();
-
         public static IServiceCollection AddEncryptor(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddSingleton<Encryptor>();

DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Application</PackageId>
-    <Version>3.1.2</Version>
+    <Version>3.1.3</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Application</Product>
@@ -14,23 +14,26 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data application user maanger</PackageTags>
-    <AssemblyVersion>3.1.2</AssemblyVersion>
+    <AssemblyVersion>3.1.3</AssemblyVersion>
-    <FileVersion>3.1.2</FileVersion>
+    <FileVersion>3.1.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Domain\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
     <PackageReference Include="DigitalData.Core.DTO" Version="2.0.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	<PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
@@ -38,16 +41,26 @@
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
-    <ProjectReference Include="..\DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Assets\icon.png">
+    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
   </ItemGroup>
 
 </Project>

DigitalData.UserManager.Application/Services/GroupOfUserService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.GroupOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/GroupService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Group;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 
 namespace DigitalData.UserManager.Application.Services

DigitalData.UserManager.Application/Services/ModuleOfUserService.cs

@@ -4,7 +4,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.ModuleOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/ModuleService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.Application;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Module;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/UserRepService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 

DigitalData.UserManager.Application/Services/UserService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 
 namespace DigitalData.UserManager.Application.Services

DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PackageId>UserManager</PackageId>
+    <Version>1.0.0</Version>
+    <Authors>Digital Data GmbH</Authors>
+    <Company>Digital Data GmbH</Company>
+    <Product>UserManager</Product>
+    <Description>Die Hauptbibliothek, die Benutzer-, Gruppen- und Modulzuweisungen über Active Directory mit Entity Framework durchführt.</Description>
+    <Copyright>Copyright 2024</Copyright>
+    <PackageIcon>icon.png</PackageIcon>
+    <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
+    <PackageTags>digital data user maanger</PackageTags>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\Assets\icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
+    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
+    <ProjectReference Include="..\DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

DigitalData.UserManager.DependencyInjection/Extensions.cs

@@ -0,0 +1,25 @@
+using DigitalData.UserManager.Application;
+using DigitalData.UserManager.Infrastructure;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DigitalData.UserManager.DependencyInjection;
+
+public static class Extensions
+{
+    public static IServiceCollection AddUserManager<TDbContext>(this IServiceCollection services) 
+        where TDbContext : DbContext, IUserManagerDbContext
+    {
+        services.AddUserManagerInfrastructure<TDbContext>();
+        services.AddUserManagerApplication();
+        return services;
+    }
+
+    public static IServiceCollection AddUserManager(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction)
+    {
+        services.AddUserManagerInfrastructure(optionsAction);
+        services.AddUserManagerApplication();
+        return services;
+    }
+}

DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Domain</PackageId>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Domain</Product>
@@ -14,12 +14,12 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data domain user maanger</PackageTags>
-    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.1</FileVersion>
+    <FileVersion>3.0.2</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Application\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
@@ -29,11 +29,4 @@
     <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Assets\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>

DigitalData.UserManager.Infrastructure/Contracts/IClientUserRepository.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IClientUserRepository : ICRUDRepository<ClientUser, int>
-    {
-        Task<IEnumerable<ClientUser>> ReadAsync(bool readOnly = true, int? userId = null);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs

@@ -1,28 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IGroupOfUserRepository : ICRUDRepository<GroupOfUser, int>
-    {
-        IQueryable<GroupOfUser> ReadByGroupId(int groupId);
-
-        Task<IEnumerable<GroupOfUser>> ReadByGroupUserIdAsync(int groupId, int userId);
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup();
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser();
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
-
-        Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
-
-        Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId);
-
-        // merge all GroupOfUserRepository-methods conditionally under this method
-        Task<IEnumerable<GroupOfUser>> ReadAsync(
-            bool readOnly = true,
-            bool withGroup = true, bool withUser = true,
-            int? id = null, int? groupId = null, int? userId = null, string? username = null);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IGroupRepository : ICRUDRepository<Group, int>
-    {
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs

@@ -1,14 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IModuleOfUserRepository : ICRUDRepository<ModuleOfUser, int>
-    {
-        IQueryable<ModuleOfUser> ReadByModuleId(int moduleId);
-
-        Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId);
-
-        Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IModuleRepository : ICRUDRepository<Module, int>
-    {
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IUserManagerDbContext.cs

@@ -1,10 +1,10 @@
 using DigitalData.UserManager.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Contracts
+namespace DigitalData.UserManager.Infrastructure.Contracts;
+
+public interface IUserManagerDbContext
 {
-    public interface IUserManagerDbContext
-    {
     public DbSet<GroupOfUser> GroupOfUsers { get; }
 
     public DbSet<Group> Groups { get; }
@@ -18,5 +18,4 @@ namespace DigitalData.UserManager.Infrastructure.Contracts
     public DbSet<UserRep> UserReps { get; }
 
     public DbSet<ClientUser> ClientUsers { get; }
-    }
 }

DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IUserRepRepository : ICRUDRepository<UserRep, int>
-    {
-        Task<IEnumerable<UserRep>> ReadAllAsync(
-            bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
-            int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs

@@ -1,18 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IUserRepository : ICRUDRepository<User, int>
-    {
-        Task<IEnumerable<User>> ReadByModuleIdAsync(int moduleId);
-
-        Task<IEnumerable<User>> ReadUnassignedByModuleIdAsync(int moduleId);
-
-        Task<IEnumerable<User>> ReadByGroupIdAsync(int groupId);
-
-        Task<IEnumerable<User>> ReadUnassignedByGroupIdAsync(int groupId);
-
-        Task<User?> ReadByUsernameAsync(string username);
-    }
-}

DigitalData.UserManager.Infrastructure/DependencyInjection.cs

@@ -0,0 +1,42 @@
+using DigitalData.UserManager.Application;
+using DigitalData.UserManager.Application.Contracts.Repositories;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Infrastructure.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DigitalData.UserManager.Infrastructure;
+
+public static class DependencyInjection
+{
+    /// <summary>
+    /// Adds the UserManager repositories to the specified <see cref="IServiceCollection"/>.
+    /// This method registers the necessary repositories for the UserManager.
+    /// </summary>
+    /// <typeparam name="TDbContext">The type of the DbContext to use for the repositories.</typeparam>
+    /// <param name="services">The IServiceCollection to which the services will be added.</param>
+    /// <returns>The updated IServiceCollection.</returns>
+    public static IServiceCollection AddUserManagerInfrastructure<TDbContext>(this IServiceCollection services)
+            where TDbContext : DbContext, IUserManagerDbContext
+    {
+        return services
+            .AddScoped<IUserRepository, UserRepository<TDbContext>>()
+            .AddScoped<IGroupRepository, GroupRepository<TDbContext>>()
+            .AddScoped<IGroupOfUserRepository, GroupOfUserRepository<TDbContext>>()
+            .AddScoped<IModuleRepository, ModuleRepository<TDbContext>>()
+            .AddScoped<IModuleOfUserRepository, ModuleOfUserRepository<TDbContext>>()
+            .AddScoped<IUserRepRepository, UserRepRepository<TDbContext>>()
+            .AddScoped<IClientUserRepository, ClientUserRepository<TDbContext>>();
+    }
+
+    /// <summary>
+    /// Adds the UserManager services and repositories to the specified <see cref="IServiceCollection"/>.
+    /// This method allows configuring the DbContext options using the provided <paramref name="optionsAction"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/> to which the services will be added.</param>
+    /// <param name="optionsAction">An <see cref="Action{T}"/> to configure the <see cref="DbContextOptionsBuilder"/>.</param>
+    /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddUserManagerInfrastructure(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction) => services
+        .AddDbContext<UserManagerDbContext>(optionsAction)
+        .AddUserManagerInfrastructure<UserManagerDbContext>();
+}

DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Infrastructure</PackageId>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Infrastructure</Product>
@@ -14,36 +14,39 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data infrastructure user maanger</PackageTags>
-    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.1</FileVersion>
+    <FileVersion>3.0.2</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Domain\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+  </ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
+	
-      <PrivateAssets>all</PrivateAssets>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
     <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Assets\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>

DigitalData.UserManager.Infrastructure/Repositories/ClientUserRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
+using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {

DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs

@@ -2,6 +2,7 @@
 using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.Infrastructure;
 using Microsoft.EntityFrameworkCore;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {

DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;

DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs

@@ -1,13 +1,14 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
+public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.ModuleOfUsers)
     {
     }
@@ -28,5 +29,4 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
     }
 
     public async Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username) => await ReadByUser(username).ToListAsync();
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs

@@ -1,15 +1,15 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
+public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public ModuleRepository(TDbContext dbContext) : base(dbContext, dbContext.Modules)
     {
     }
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs

@@ -1,13 +1,14 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
+public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public UserRepRepository(TDbContext dbContext) : base(dbContext, dbContext.UserReps)
     {
     }
@@ -44,5 +45,4 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
 
         return await query.ToListAsync();
     }
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;

DigitalData.UserManager.sln

@@ -11,6 +11,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Inf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.API", "DigitalData.UserManager.API\DigitalData.UserManager.API.csproj", "{07CCD651-647C-49F7-9715-30CEBC13710D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.UserManager.DependencyInjection", "DigitalData.UserManager.DependencyInjection\DigitalData.UserManager.DependencyInjection.csproj", "{7E5FD115-EE6D-48F2-ACF1-E951EC071073}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		Assets\icon.png = Assets\icon.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +42,17 @@ Global
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6804DE1E-B257-4DC9-B9D4-08C8518C8282}
 	EndGlobalSection