upgrade to .net8

Source/Modules/Channels/Features/Modules.Channels.Features.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Channels/IntegrationEvents/Modules.Channels.IntegrationEvents.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Channels/Web/Client/Modules.Channels.Web.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Channels/Web/DTOs/Modules.Channels.Web.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs

@@ -9,7 +9,7 @@
 using Modules.Channels.Features.Aggregates.ChannelAggregate.Application.Commands;
 using Modules.Channels.Features.Aggregates.ChannelAggregate.Application.Queries;
 using Shared.Kernel.BuildingBlocks.Authorization.Attributes;
-using Shared.Kernel.Constants;
+using Shared.Kernel.BuildingBlocks.Auth.Constants;
 
 namespace Modules.Channels.Web.Server.Controllers
 {

Source/Modules/Channels/Web/Server/Modules.Channels.Web.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Source/Modules/LandingPages/Web/Server/Modules.LandingPages.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>

Source/Modules/Subscription/Features/Modules.Subscription.Features/Modules.Subscriptions.Features.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Subscription/IntegrationEvents/Modules.Subscriptions.IntegrationEvents.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Subscription/Web/Client/Modules.Subscriptions.Web.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Subscription/Web/DTOs/Modules.Subscriptions.Web.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/Subscription/Web/Server/Modules.Subscriptions.Web.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Aggregates/UserAggregate/Application/Queries/GetClaimsForUser.cs

@@ -1,6 +1,6 @@
 using Modules.TenantIdentity.Features.Infrastructure.EFCore;
 using Shared.Features.CQRS.Query;
-using Shared.SharedKernel.Constants;
+using Shared.Kernel.BuildingBlocks.Auth.Constants;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Infrastructure/UserClaimsPrincipalFactory.cs

@@ -5,7 +5,7 @@
 using Modules.TenantIdentity.Features.Aggregates.UserAggregate;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using Shared.SharedKernel.Constants;
+using Shared.Kernel.BuildingBlocks.Auth.Constants;
 
 namespace Modules.TenantIdentity.Features.Infrastructure
 {

Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Modules.TenantIdentity.Features.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Source/Modules/TenantIdentity/IntegrationEvents/Modules.TenantIdentity.IntegrationEvents.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/TenantIdentity/Web/Client/Modules.TenantIdentity.Web.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/TenantIdentity/Web/DTOs/Modules.TenantIdentity.Web.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Source/Modules/TenantIdentity/Web/Server/Controllers/ExternalLoginCallbackController.cs

@@ -5,9 +5,9 @@
 using Shared.Modules.Layers.Application.CQRS.Command;
 using Module.Shared.Modules.Layers.Features;
 using Shared.Modules.Layers.Features.Identity.Commands;
-using Shared.SharedKernel.Constants;
 using ApplicationUserManager = Shared.Modules.Layers.Features.Identity.ApplicationUserManager;
 using Shared.SharedKernel.Exstensions;
+using Shared.Kernel.BuildingBlocks.Auth.Constants;
 
 namespace WebServer.Controllers.Identity
 {

Source/Modules/TenantIdentity/Web/Server/Modules.TenantIdentity.Web.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs

@@ -10,8 +10,8 @@
 using Microsoft.Extensions.Hosting;
 using Modules.TenantIdentity.Layers.Features;
 using Shared.Features.Modules;
+using Shared.Kernel.BuildingBlocks.Auth.Constants;
 using Shared.Kernel.BuildingBlocks.Authorization.Services;
-using Shared.SharedKernel.Constants;
 using System.Reflection;
 using System.Security.Claims;
 

Source/Shared/Features/CQRS/DomainEvent/DomainEventDispatcher.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Features.Domain;
+using Shared.Kernel.BuildingBlocks;
 
 namespace Shared.Features.CQRS.DomainEvent
 {

Source/Shared/Features/CQRS/DomainEvent/IDomainEventDispatcher.cs

@@ -1,4 +1,4 @@
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Features.Domain;
 
 namespace Shared.Features.CQRS.DomainEvent
 {

Source/Shared/Features/CQRS/DomainEvent/IDomainEventHandler.cs

@@ -1,4 +1,4 @@
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Features.Domain;
 
 namespace Shared.Features.CQRS.DomainEvent
 {

Source/Shared/Features/CQRS/IntegrationEvent/IIntegrationEventDispatcher.cs

@@ -1,4 +1,4 @@
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Kernel.BuildingBlocks;
 
 namespace Shared.Features.CQRS.IntegrationEvent
 {

Source/Shared/Features/CQRS/IntegrationEvent/IIntegrationEventHandler.cs

@@ -1,4 +1,4 @@
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Kernel.BuildingBlocks;
 
 namespace Shared.Features.CQRS.IntegrationEvent
 {

Source/Shared/Features/CQRS/IntegrationEvent/IntegrationEventDispatcher.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Shared.Features.DomainKernel.Interfaces;
+using Shared.Kernel.BuildingBlocks;
 
 namespace Shared.Features.CQRS.IntegrationEvent
 {

Source/Shared/Features/Domain/AggregateRoot.cs

@@ -0,0 +1,23 @@
+using SendGrid.Helpers.Errors.Model;
+using Shared.Kernel.BuildingBlocks.Auth.DomainKernel;
+using Shared.Kernel.BuildingBlocks;
+using Shared.SharedKernel.Interfaces;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Shared.Features.Domain
+{
+    public class AggregateRoot : Entity, ITenantIdentifiable
+    {
+        [NotMapped]
+        public IExecutionContext ExecutionContext { get; set; }
+        public virtual Guid TenantId { get; set; }
+
+        public void ThrowIfCallerIsNotInRole(TenantRole role)
+        {
+            if (ExecutionContext.TenantRole != role)
+            {
+                throw new UnauthorizedException();
+            }
+        }
+    }
+}

Source/Shared/Features/DomainKernel/Entity.cs → Source/Shared/Features/Domain/Entity.cs

@@ -1,8 +1,7 @@
 using Shared.Features.DomainKernel.Exceptions;
-using Shared.Features.DomainKernel.Interfaces;
 using Shared.SharedKernel.Interfaces;
 
-namespace Shared.Features.DomainKernel
+namespace Shared.Features.Domain
 {
     public abstract class Entity : IAuditable, IIdentifiable, IConcurrent
     {

Source/Shared/Features/DomainKernel/DomainException.cs → Source/Shared/Features/Domain/Exceptions/DomainException.cs

@@ -1,4 +1,4 @@
-namespace Shared.Features.DomainKernel
+namespace Shared.Features.Domain.Exceptions
 {
     public class DomainException : Exception
     {

Source/Shared/Features/DomainKernel/Exceptions/InvalidEntityDeleteException.cs → Source/Shared/Features/Domain/Exceptions/InvalidEntityDeleteException.cs

@@ -1,4 +1,6 @@
-namespace Shared.Features.DomainKernel.Exceptions
+using Shared.Features.Domain.Exceptions;
+
+namespace Shared.Features.DomainKernel.Exceptions
 {
     public class InvalidEntityDeleteException : DomainException
     {

Source/Shared/Features/Domain/IDomainEvent.cs

@@ -0,0 +1,6 @@
+namespace Shared.Features.Domain
+{
+    public interface IDomainEvent
+    {
+    }
+}

Source/Shared/Features/DomainKernel/ValueObject.cs → Source/Shared/Features/Domain/ValueObject.cs

@@ -1,4 +1,4 @@
-namespace Shared.Features.DomainKernel
+namespace Shared.Features.Domain
 {
     public abstract class ValueObject
     {

Source/Shared/Features/EFCore/ExecutionContextInterceptor.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Shared.Features.Domain;
+using Shared.Kernel.BuildingBlocks;
+
+namespace Shared.Features.EFCore
+{
+    public class ExecutionContextInterceptor : SaveChangesInterceptor
+    {
+        public object InitializedInstance(
+            MaterializationInterceptionData materializationData,
+            object instance)
+        {
+            if (instance is AggregateRoot aggregateRoot)
+            {
+                aggregateRoot.ExecutionContext = materializationData
+                    .Context
+                    .GetService<IExecutionContext>();
+            }
+
+            return instance;
+        }
+    }
+}

Source/Shared/Features/EFCore/MultiTenancy/MultiTenancyEntityConfiguration.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Shared.Features.Domain;
 using Shared.Features.DomainKernel;
 using Shared.Features.DomainKernel.Attributes;
 using System.Reflection;

Source/Shared/Features/EFCore/Registrator.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Shared.Features.EFCore.Configuration;
+using Shared.Features.Modules.Configuration;
+
+namespace Shared.Features.EFCore
+{
+    public static class Registrator
+    {
+        public static IServiceCollection AddEFCore(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.RegisterModuleConfiguration<EFCoreConfiguration, EFCoreConfigurationValidator>(configuration);
+            services.AddScoped<TransactionScopeMiddleware>();
+
+            return services;
+        }
+
+        public static IApplicationBuilder UseEFCoreMiddleware(this IApplicationBuilder app)
+        {
+            app.UseMiddleware<TransactionScopeMiddleware>();
+
+            return app;
+        }
+    }
+}

Source/Shared/Features/EFCore/TransactionScopeMiddleware.cs

@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Http;
+using System.Transactions;
+
+namespace Shared.Features.EFCore
+{
+    public class TransactionScopeMiddleware : IMiddleware
+    {
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            using (var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled))
+            {
+                await next(context);
+
+                scope.Complete();
+            }
+        }
+    }
+}

Source/Shared/Features/Modules/Configuration/IModuleConfiguration.cs

@@ -0,0 +1,6 @@
+namespace Shared.Features.Modules.Configuration
+{
+    public interface IModuleConfiguration
+    {
+    }
+}