Combine all SharedKernel projects into a single assembly called Share…

…dKernel
platformplatform · Aug 29, 2024 · 5aff0a8 · 5aff0a8
1 parent 645a1de
commit 5aff0a8
Show file tree

Hide file tree

Showing 162 changed files with 350 additions and 456 deletions.
diff --git a/.github/workflows/account-management.yml b/.github/workflows/account-management.yml
@@ -72,10 +72,10 @@ jobs:
         run: dotnet restore
 
       - name: Generate and set user secret for token signing key
-        working-directory: application/shared-kernel/InfrastructureCore
+        working-directory: application/shared-kernel/SharedKernel
         run: |
           # Extract UserSecretsId from the .csproj file
-          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.InfrastructureCore.csproj)
+          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.csproj)
           
           # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
           dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID

diff --git a/.github/workflows/back-office.yml b/.github/workflows/back-office.yml
@@ -72,10 +72,10 @@ jobs:
         run: dotnet restore
 
       - name: Generate and set user secret for token signing key
-        working-directory: application/shared-kernel/InfrastructureCore
+        working-directory: application/shared-kernel/SharedKernel
         run: |
           # Extract UserSecretsId from the .csproj file
-          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.InfrastructureCore.csproj)
+          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.csproj)
           
           # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
           dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID

diff --git a/application/AppGateway/AppGateway.csproj b/application/AppGateway/AppGateway.csproj
@@ -14,8 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\shared-kernel\ApiCore\SharedKernel.ApiCore.csproj" />
-        <ProjectReference Include="..\shared-kernel\InfrastructureCore\SharedKernel.InfrastructureCore.csproj" />
+        <ProjectReference Include="..\shared-kernel\SharedKernel\SharedKernel.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/application/AppGateway/Middleware/AuthenticationCookieMiddleware.cs b/application/AppGateway/Middleware/AuthenticationCookieMiddleware.cs
@@ -2,7 +2,7 @@
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using Microsoft.IdentityModel.Tokens;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
+using PlatformPlatform.SharedKernel.Authentication;
 
 namespace PlatformPlatform.AppGateway.Middleware;
 

diff --git a/application/AppGateway/Program.cs b/application/AppGateway/Program.cs
@@ -2,7 +2,7 @@
 using PlatformPlatform.AppGateway.Filters;
 using PlatformPlatform.AppGateway.Middleware;
 using PlatformPlatform.AppGateway.Transformations;
-using PlatformPlatform.SharedKernel.InfrastructureCore;
+using PlatformPlatform.SharedKernel;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/application/AppGateway/Transformations/SharedAccessSignatureRequestTransform.cs b/application/AppGateway/Transformations/SharedAccessSignatureRequestTransform.cs
@@ -1,4 +1,4 @@
-using PlatformPlatform.SharedKernel.ApplicationCore.Services;
+using PlatformPlatform.SharedKernel.Services;
 using Yarp.ReverseProxy.Transforms;
 
 namespace PlatformPlatform.AppGateway.Transformations;

diff --git a/application/PlatformPlatform.sln b/application/PlatformPlatform.sln
@@ -5,18 +5,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppGateway", "AppGateway\Ap
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared-kernel", "shared-kernel", "{F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel.DomainCore", "shared-kernel\DomainCore\SharedKernel.DomainCore.csproj", "{9781DA05-517E-46D7-9F8B-2C01AA74F1E4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel.ApplicationCore", "shared-kernel\ApplicationCore\SharedKernel.ApplicationCore.csproj", "{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel.InfrastructureCore", "shared-kernel\InfrastructureCore\SharedKernel.InfrastructureCore.csproj", "{2B5B1AC7-7254-4527-B0F0-8F0A203CB625}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel.ApiCore", "shared-kernel\ApiCore\SharedKernel.ApiCore.csproj", "{836ABCEF-C16B-4331-B8D5-0EA75E4101FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel", "shared-kernel\SharedKernel\SharedKernel.csproj", "{836ABCEF-C16B-4331-B8D5-0EA75E4101FE}"
 EndProject
 Project("{54A90642-561A-4BB1-A94E-469ADEE60C69}") = "SharedKernel.WebApp", "shared-webapp\SharedKernel.WebApp.esproj", "{72F46822-5815-48E0-9E2C-F95A4D58CB3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9E2EF0B0-2A92-489B-8910-070C871197B0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedKernel.Tests", "shared-kernel\Tests\SharedKernel.Tests.csproj", "{B232D7BB-396A-46FE-B6D2-95041412C835}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "account-management", "account-management", "{EEA1463E-71F8-44E6-8055-787DAA5E62D2}"
@@ -57,18 +49,6 @@ Global
 		{8A9E566E-2DE4-4A60-9030-615C939BC05C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A9E566E-2DE4-4A60-9030-615C939BC05C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A9E566E-2DE4-4A60-9030-615C939BC05C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9781DA05-517E-46D7-9F8B-2C01AA74F1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9781DA05-517E-46D7-9F8B-2C01AA74F1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9781DA05-517E-46D7-9F8B-2C01AA74F1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9781DA05-517E-46D7-9F8B-2C01AA74F1E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B5B1AC7-7254-4527-B0F0-8F0A203CB625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B5B1AC7-7254-4527-B0F0-8F0A203CB625}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B5B1AC7-7254-4527-B0F0-8F0A203CB625}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B5B1AC7-7254-4527-B0F0-8F0A203CB625}.Release|Any CPU.Build.0 = Release|Any CPU
 		{836ABCEF-C16B-4331-B8D5-0EA75E4101FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{836ABCEF-C16B-4331-B8D5-0EA75E4101FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{836ABCEF-C16B-4331-B8D5-0EA75E4101FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -126,13 +106,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9781DA05-517E-46D7-9F8B-2C01AA74F1E4} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
-		{9F41C6BD-7DF5-46AD-B0E7-4E4CECA2B9BF} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
-		{2B5B1AC7-7254-4527-B0F0-8F0A203CB625} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
 		{836ABCEF-C16B-4331-B8D5-0EA75E4101FE} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
 		{72F46822-5815-48E0-9E2C-F95A4D58CB3F} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
-		{9E2EF0B0-2A92-489B-8910-070C871197B0} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
-		{B232D7BB-396A-46FE-B6D2-95041412C835} = {9E2EF0B0-2A92-489B-8910-070C871197B0}
 		{B155D1D9-4F6E-42AE-A8F0-92CD50BF182D} = {EEA1463E-71F8-44E6-8055-787DAA5E62D2}
 		{25F28E3C-84F0-44D6-8EB2-259398C2D14A} = {EEA1463E-71F8-44E6-8055-787DAA5E62D2}
 		{4AF4767C-1BF5-4B86-9050-F05ABF6AF4BE} = {EEA1463E-71F8-44E6-8055-787DAA5E62D2}
@@ -143,6 +118,7 @@ Global
 		{B1C5EFF3-B6EF-4B8F-B392-0E1AA2D81533} = {E6B8D5DB-DA05-42EA-8DD0-EAE366870126}
 		{ABEB4337-3606-4730-8ABE-94DF98C2C348} = {EEA1463E-71F8-44E6-8055-787DAA5E62D2}
 		{62DB02EA-D720-46DC-BB78-13771E6D9A12} = {E6B8D5DB-DA05-42EA-8DD0-EAE366870126}
+		{B232D7BB-396A-46FE-B6D2-95041412C835} = {F01E4DC8-2A8B-4CB9-893A-B3B8FF2EFE22}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

diff --git a/application/account-management/AccountManagement.slnf b/application/account-management/AccountManagement.slnf
@@ -4,10 +4,7 @@
     "projects": [
       "AppHost\\AppHost.csproj",
       "AppGateway\\AppGateway.csproj",
-      "shared-kernel\\DomainCore\\SharedKernel.DomainCore.csproj",
-      "shared-kernel\\ApplicationCore\\SharedKernel.ApplicationCore.csproj",
-      "shared-kernel\\InfrastructureCore\\SharedKernel.InfrastructureCore.csproj",
-      "shared-kernel\\ApiCore\\SharedKernel.ApiCore.csproj",
+      "shared-kernel\\SharedKernel\\SharedKernel.csproj",
       "shared-kernel\\Tests\\SharedKernel.Tests.csproj",
       "account-management\\Core\\AccountManagement.Core.csproj",
       "account-management\\Workers\\AccountManagement.Workers.csproj",

diff --git a/application/account-management/Api/AccountManagement.Api.csproj b/application/account-management/Api/AccountManagement.Api.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\shared-kernel\ApiCore\SharedKernel.ApiCore.csproj" />
+        <ProjectReference Include="..\..\shared-kernel\SharedKernel\SharedKernel.csproj" />
         <ProjectReference Include="..\Core\AccountManagement.Core.csproj" />
     </ItemGroup>
 

diff --git a/application/account-management/Api/Authentication/AuthenticationEndpoints.cs b/application/account-management/Api/Authentication/AuthenticationEndpoints.cs
@@ -1,7 +1,7 @@
 using PlatformPlatform.AccountManagement.Core.Authentication.Commands;
 using PlatformPlatform.AccountManagement.Core.Authentication.Domain;
-using PlatformPlatform.SharedKernel.ApiCore.ApiResults;
-using PlatformPlatform.SharedKernel.ApiCore.Endpoints;
+using PlatformPlatform.SharedKernel.ApiResults;
+using PlatformPlatform.SharedKernel.Endpoints;
 
 namespace PlatformPlatform.AccountManagement.Api.Authentication;
 

diff --git a/application/account-management/Api/Program.cs b/application/account-management/Api/Program.cs
@@ -1,6 +1,6 @@
 using PlatformPlatform.AccountManagement.Core;
-using PlatformPlatform.SharedKernel.ApiCore;
-using PlatformPlatform.SharedKernel.ApiCore.SinglePageApp;
+using PlatformPlatform.SharedKernel;
+using PlatformPlatform.SharedKernel.SinglePageApp;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/application/account-management/Api/Signups/SignupEndpoints.cs b/application/account-management/Api/Signups/SignupEndpoints.cs
@@ -1,8 +1,8 @@
 using PlatformPlatform.AccountManagement.Core.Signups.Commands;
 using PlatformPlatform.AccountManagement.Core.Signups.Domain;
 using PlatformPlatform.AccountManagement.Core.Signups.Queries;
-using PlatformPlatform.SharedKernel.ApiCore.ApiResults;
-using PlatformPlatform.SharedKernel.ApiCore.Endpoints;
+using PlatformPlatform.SharedKernel.ApiResults;
+using PlatformPlatform.SharedKernel.Endpoints;
 
 namespace PlatformPlatform.AccountManagement.Api.Signups;
 

diff --git a/application/account-management/Api/Tenants/TenantEndpoints.cs b/application/account-management/Api/Tenants/TenantEndpoints.cs
@@ -1,8 +1,8 @@
 using PlatformPlatform.AccountManagement.Core.Tenants.Commands;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
 using PlatformPlatform.AccountManagement.Core.Tenants.Queries;
-using PlatformPlatform.SharedKernel.ApiCore.ApiResults;
-using PlatformPlatform.SharedKernel.ApiCore.Endpoints;
+using PlatformPlatform.SharedKernel.ApiResults;
+using PlatformPlatform.SharedKernel.Endpoints;
 
 namespace PlatformPlatform.AccountManagement.Api.Tenants;
 

diff --git a/application/account-management/Api/Users/UserEndpoints.cs b/application/account-management/Api/Users/UserEndpoints.cs
@@ -1,8 +1,8 @@
 using PlatformPlatform.AccountManagement.Core.Users.Commands;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
 using PlatformPlatform.AccountManagement.Core.Users.Queries;
-using PlatformPlatform.SharedKernel.ApiCore.ApiResults;
-using PlatformPlatform.SharedKernel.ApiCore.Endpoints;
+using PlatformPlatform.SharedKernel.ApiResults;
+using PlatformPlatform.SharedKernel.Endpoints;
 
 namespace PlatformPlatform.AccountManagement.Api.Users;
 

diff --git a/application/account-management/Core/AccountManagement.Core.csproj b/application/account-management/Core/AccountManagement.Core.csproj
@@ -9,12 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\shared-kernel\ApplicationCore\SharedKernel.ApplicationCore.csproj" />
-        <ProjectReference Include="..\..\shared-kernel\InfrastructureCore\SharedKernel.InfrastructureCore.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" />
+        <ProjectReference Include="..\..\shared-kernel\SharedKernel\SharedKernel.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/application/account-management/Core/Authentication/Commands/CompleteLogin.cs b/application/account-management/Core/Authentication/Commands/CompleteLogin.cs
@@ -2,9 +2,9 @@
 using PlatformPlatform.AccountManagement.Core.Authentication.Services;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Authentication;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Commands;
 

diff --git a/application/account-management/Core/Authentication/Commands/Logut.cs b/application/account-management/Core/Authentication/Commands/Logut.cs
@@ -3,8 +3,8 @@
 using PlatformPlatform.AccountManagement.Core.Authentication.Services;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Commands;
 

diff --git a/application/account-management/Core/Authentication/Commands/RefreshAuthenticationTokens.cs b/application/account-management/Core/Authentication/Commands/RefreshAuthenticationTokens.cs
@@ -4,8 +4,8 @@
 using PlatformPlatform.AccountManagement.Core.Authentication.Services;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Commands;
 

diff --git a/application/account-management/Core/Authentication/Commands/StartLogin.cs b/application/account-management/Core/Authentication/Commands/StartLogin.cs
@@ -3,11 +3,11 @@
 using PlatformPlatform.AccountManagement.Core.Authentication.Domain;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.Services;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
-using PlatformPlatform.SharedKernel.ApplicationCore.Validation;
+using PlatformPlatform.SharedKernel.Authentication;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.Services;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Validation;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Commands;
 

diff --git a/application/account-management/Core/Authentication/Domain/ILoginProcessRepository.cs b/application/account-management/Core/Authentication/Domain/ILoginProcessRepository.cs
@@ -1,4 +1,4 @@
-using PlatformPlatform.SharedKernel.DomainCore.Entities;
+using PlatformPlatform.SharedKernel.Entities;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Domain;
 

diff --git a/application/account-management/Core/Authentication/Domain/Login.cs b/application/account-management/Core/Authentication/Domain/Login.cs
@@ -1,8 +1,8 @@
 using JetBrains.Annotations;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.DomainCore.Entities;
-using PlatformPlatform.SharedKernel.DomainCore.Identity;
+using PlatformPlatform.SharedKernel.Entities;
+using PlatformPlatform.SharedKernel.Identity;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Domain;
 

diff --git a/application/account-management/Core/Authentication/Domain/LoginProcessRepository.cs b/application/account-management/Core/Authentication/Domain/LoginProcessRepository.cs
@@ -1,5 +1,5 @@
 using PlatformPlatform.AccountManagement.Core.Database;
-using PlatformPlatform.SharedKernel.InfrastructureCore.Persistence;
+using PlatformPlatform.SharedKernel.Persistence;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Domain;
 

diff --git a/application/account-management/Core/Authentication/Services/AuthenticationTokenGenerator.cs b/application/account-management/Core/Authentication/Services/AuthenticationTokenGenerator.cs
@@ -2,7 +2,7 @@
 using System.Security.Claims;
 using Microsoft.IdentityModel.Tokens;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
+using PlatformPlatform.SharedKernel.Authentication;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Services;
 

diff --git a/application/account-management/Core/Authentication/Services/AuthenticationTokenService.cs b/application/account-management/Core/Authentication/Services/AuthenticationTokenService.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
+using PlatformPlatform.SharedKernel.Authentication;
 
 namespace PlatformPlatform.AccountManagement.Core.Authentication.Services;
 

diff --git a/application/account-management/Core/Database/AccountManagementDbContext.cs b/application/account-management/Core/Database/AccountManagementDbContext.cs
@@ -3,7 +3,7 @@
 using PlatformPlatform.AccountManagement.Core.Signups.Domain;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.InfrastructureCore.EntityFramework;
+using PlatformPlatform.SharedKernel.EntityFramework;
 
 namespace PlatformPlatform.AccountManagement.Core.Database;
 

diff --git a/application/account-management/Core/DependencyConfiguration.cs b/application/account-management/Core/DependencyConfiguration.cs
@@ -3,8 +3,7 @@
 using Microsoft.Extensions.Hosting;
 using PlatformPlatform.AccountManagement.Core.Authentication.Services;
 using PlatformPlatform.AccountManagement.Core.Database;
-using PlatformPlatform.SharedKernel.ApplicationCore;
-using PlatformPlatform.SharedKernel.InfrastructureCore;
+using PlatformPlatform.SharedKernel;
 
 namespace PlatformPlatform.AccountManagement.Core;
 
@@ -15,7 +14,7 @@ public static class DependencyConfiguration
     public static IServiceCollection AddServices(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddApplicationCoreServices(Assembly);
-        services.ConfigureInfrastructureCoreServices<AccountManagementDbContext>(Assembly);
+        services.AddInfrastructureCoreServices<AccountManagementDbContext>(Assembly);
 
         services.AddHttpContextAccessor();
 

diff --git a/application/account-management/Core/Signups/Commands/CompleteSignup.cs b/application/account-management/Core/Signups/Commands/CompleteSignup.cs
@@ -1,9 +1,9 @@
 using PlatformPlatform.AccountManagement.Core.Signups.Domain;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Authentication;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Commands;
 

diff --git a/application/account-management/Core/Signups/Commands/StartSignup.cs b/application/account-management/Core/Signups/Commands/StartSignup.cs
@@ -3,11 +3,11 @@
 using PlatformPlatform.AccountManagement.Core.Signups.Domain;
 using PlatformPlatform.AccountManagement.Core.TelemetryEvents;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Authentication;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
-using PlatformPlatform.SharedKernel.ApplicationCore.Services;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
-using PlatformPlatform.SharedKernel.ApplicationCore.Validation;
+using PlatformPlatform.SharedKernel.Authentication;
+using PlatformPlatform.SharedKernel.Cqrs;
+using PlatformPlatform.SharedKernel.Services;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
+using PlatformPlatform.SharedKernel.Validation;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Commands;
 

diff --git a/application/account-management/Core/Signups/Domain/ISignupRepository.cs b/application/account-management/Core/Signups/Domain/ISignupRepository.cs
@@ -1,5 +1,5 @@
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.DomainCore.Entities;
+using PlatformPlatform.SharedKernel.Entities;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Domain;
 

diff --git a/application/account-management/Core/Signups/Domain/Signup.cs b/application/account-management/Core/Signups/Domain/Signup.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.DomainCore.Entities;
-using PlatformPlatform.SharedKernel.DomainCore.Identity;
+using PlatformPlatform.SharedKernel.Entities;
+using PlatformPlatform.SharedKernel.Identity;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Domain;
 

diff --git a/application/account-management/Core/Signups/Domain/SignupRepository.cs b/application/account-management/Core/Signups/Domain/SignupRepository.cs
@@ -1,6 +1,6 @@
 using PlatformPlatform.AccountManagement.Core.Database;
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.InfrastructureCore.Persistence;
+using PlatformPlatform.SharedKernel.Persistence;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Domain;
 

diff --git a/application/account-management/Core/Signups/Queries/IsSubdomainFree.cs b/application/account-management/Core/Signups/Queries/IsSubdomainFree.cs
@@ -1,5 +1,5 @@
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.Cqrs;
+using PlatformPlatform.SharedKernel.Cqrs;
 
 namespace PlatformPlatform.AccountManagement.Core.Signups.Queries;
 

diff --git a/application/account-management/Core/TelemetryEvents/TelemetryEvents.cs b/application/account-management/Core/TelemetryEvents/TelemetryEvents.cs
@@ -1,6 +1,6 @@
 using PlatformPlatform.AccountManagement.Core.Tenants.Domain;
 using PlatformPlatform.AccountManagement.Core.Users.Domain;
-using PlatformPlatform.SharedKernel.ApplicationCore.TelemetryEvents;
+using PlatformPlatform.SharedKernel.TelemetryEvents;
 
 namespace PlatformPlatform.AccountManagement.Core.TelemetryEvents;