From 270929948df1b18fec7d5d76f34e30fc60becb1f Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@litecharms.co.za>
Date: Wed, 21 Oct 2026 10:41:23 +0200
Subject: [PATCH] Restructured .net solutions Resolved volnerability

---
 Directory.Build.props                         | 101 ++++++++
 Directory.Packages.props                      | 115 +++++++++
 PostFundManagement.Api/Dockerfile             |   8 +-
 .../PostFundManagement.Api.csproj             | 106 +++-----
 .../PostFundManagement.Application.csproj     | 100 +-------
 .../PostFundManagement.Domain.csproj          | 238 ++++++------------
 .../PostFundManagement.Infrastructure.csproj  |  47 +---
 .../PostFundManagement.Tests.csproj           |  20 +-
 PostFundManagement.slnx                       |   2 +
 9 files changed, 357 insertions(+), 380 deletions(-)
 create mode 100644 Directory.Build.props
 create mode 100644 Directory.Packages.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..7786cc4
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,101 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <NoWarn>$(NoWarn);1701;1702;MA0048;MA0051;AV0029;AV0030</NoWarn>
+  </PropertyGroup>
+
+  <!-- Assembly signing and licensing for non-test projects -->
+  <PropertyGroup Condition="!$(MSBuildProjectName.EndsWith('Tests'))">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)PostFundManagement.snk</AssemblyOriginatorKeyFile>
+    <PackageLicenseFile>$(MSBuildThisFileDirectory)LICENSE</PackageLicenseFile>
+  </PropertyGroup>
+
+  <!-- Centralized Common Usings across solution -->
+  <ItemGroup>
+    <!-- System & BCL -->
+    <Using Include="System.Collections.ObjectModel" />
+    <Using Include="System.ComponentModel.DataAnnotations" />
+    <Using Include="System.Globalization" />
+    <Using Include="System.Net" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Security.Cryptography" />
+    <Using Include="System.Security.Cryptography.X509Certificates" />
+    <Using Include="System.Text" />
+    <Using Include="System.Text.Json" />
+    <Using Include="System.Text.Json.Serialization" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.Threading.Channels" />
+    <Using Include="System.Web" />
+
+    <!-- Microsoft Extensions & Web Core -->
+    <Using Include="Microsoft.AspNetCore.Builder" />
+    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
+    <Using Include="Microsoft.AspNetCore.DataProtection" />
+    <Using Include="Microsoft.AspNetCore.Http" />
+    <Using Include="Microsoft.AspNetCore.Routing" />
+    <Using Include="Microsoft.Extensions.Configuration" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
+    <Using Include="Microsoft.Extensions.Hosting" />
+    <Using Include="Microsoft.Extensions.Logging" />
+    <Using Include="Microsoft.Extensions.Options" />
+    <Using Include="Microsoft.IdentityModel.Tokens" />
+
+    <!-- Domain Constants -->
+    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
+
+    <!-- CQRS, Utilities & Persistence -->
+    <Using Include="FluentResults" />
+    <Using Include="HashidsNet" />
+    <Using Include="Humanizer" />
+    <Using Include="Mediator" />
+    <Using Include="Microsoft.EntityFrameworkCore" />
+    <Using Include="Microsoft.EntityFrameworkCore.Design" />
+    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
+    <Using Include="Quartz" />
+    <Using Include="Refit" />
+
+    <!-- API & Documentation -->
+    <Using Include="Asp.Versioning" />
+    <Using Include="Microsoft.AspNetCore.OpenApi" />
+    <Using Include="Microsoft.OpenApi" />
+    <Using Include="Scalar.AspNetCore" />
+
+    <!-- Authentication -->
+    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
+    <Using Include="Microsoft.AspNetCore.Authentication" />
+    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+
+    <!-- Diagnostics & Health -->
+    <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+
+    <!-- Messaging & Cloud Storage -->
+    <Using Include="Amazon.Runtime" />
+    <Using Include="Amazon.S3" />
+    <Using Include="Amazon.S3.Model" />
+    <Using Include="MailKit.Net.Smtp" />
+    <Using Include="MimeKit" />
+  </ItemGroup>
+
+  <!-- Domain-specific Usings (Domain and downstream projects excluding Infrastructure where Claim/Activity/TokenRequest collide) -->
+  <ItemGroup Condition="'$(MSBuildProjectName)' == 'PostFundManagement.Domain'">
+    <Using Include="System.Security.Claims" />
+    <Using Include="AccessTokenClient" />
+  </ItemGroup>
+
+  <!-- Non-Domain / Non-Infrastructure Usings (Application, Api, Tests) -->
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'PostFundManagement.Domain' and '$(MSBuildProjectName)' != 'PostFundManagement.Infrastructure'">
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Security.Claims" />
+    <Using Include="AccessTokenClient" />
+    <Using Static="true" Include="PostFundManagement.Application.Extensions.General" />
+  </ItemGroup>
+</Project>
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..b42f02f
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,115 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Core & Utilities -->
+    <PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
+    <PackageVersion Include="Hashids.net" Version="1.7.0" />
+    <PackageVersion Include="Humanizer" Version="3.0.10" />
+    <PackageVersion Include="Scrutor" Version="7.0.0" />
+
+    <!-- Microsoft Extensions & Configuration -->
+    <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.Validation" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.FeatureManagement.AspNetCore" Version="4.7.0" />
+
+    <!-- Security, Authentication & Identity -->
+    <PackageVersion Include="AccessTokenClient.Extensions" Version="5.1.0" />
+    <PackageVersion Include="Duende.AccessTokenManagement" Version="4.2.0" />
+    <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.2.0" />
+    <PackageVersion Include="IdentityModel" Version="6.2.0" />
+    <PackageVersion Include="IdentityModel.AspNetCore" Version="4.3.0" />
+    <PackageVersion Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
+    <PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+    <PackageVersion Include="KubernetesClient" Version="19.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.12" />
+    <!-- Upgraded to latest non-vulnerable version -->
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.12" />
+
+    <!-- Resilience -->
+    <PackageVersion Include="Polly" Version="8.8.0" />
+    <PackageVersion Include="Polly.Extensions" Version="8.8.0" />
+
+    <!-- API, Web & Documentation -->
+    <PackageVersion Include="Asp.Versioning.Abstractions" Version="10.2.1" />
+    <PackageVersion Include="Asp.Versioning.Http" Version="10.2.3" />
+    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.2.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="10.0.12" />
+    <PackageVersion Include="Refit.HttpClientFactory" Version="15.2.0" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.17.4" />
+
+    <!-- Database & Entity Framework Core -->
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.12" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
+
+    <!-- Quartz Scheduler -->
+    <PackageVersion Include="Quartz" Version="4.1.0" />
+    <PackageVersion Include="Quartz.AspNetCore" Version="4.1.0" />
+    <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="4.1.0" />
+    <PackageVersion Include="Quartz.Plugins" Version="4.1.0" />
+    <PackageVersion Include="Quartz.Plugins.TimeZoneConverter" Version="4.1.0" />
+    <PackageVersion Include="Quartz.Serialization.SystemTextJson" Version="4.1.0" />
+
+    <!-- Health Checks -->
+    <PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
+
+    <!-- Observability & OpenTelemetry -->
+    <PackageVersion Include="OpenTelemetry" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.18.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
+
+    <!-- Email & Messaging -->
+    <PackageVersion Include="MailKit" Version="4.18.0" />
+    <PackageVersion Include="MimeKit" Version="4.18.0" />
+
+    <!-- CQRS & Mediator -->
+    <PackageVersion Include="FluentResults" Version="4.0.0" />
+    <PackageVersion Include="Mediator.Abstractions" Version="3.0.2" />
+    <PackageVersion Include="Mediator.SourceGenerator" Version="3.0.2" />
+
+    <!-- Cloud Storage -->
+    <PackageVersion Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.101.4" />
+    <PackageVersion Include="AWSSDK.S3" Version="4.0.103.3" />
+
+    <!-- Analyzers -->
+    <PackageVersion Include="Meziantou.Analyzer" Version="3.0.259" />
+
+    <!-- Testing -->
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
+  </ItemGroup>
+</Project>
+
diff --git a/PostFundManagement.Api/Dockerfile b/PostFundManagement.Api/Dockerfile
index 835b34f..d4c99cc 100644
--- a/PostFundManagement.Api/Dockerfile
+++ b/PostFundManagement.Api/Dockerfile
@@ -8,7 +8,11 @@ EXPOSE 8080
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 
-# Copy csproj files for layer caching
+# Copy props and csproj files for layer caching
+COPY ["Directory.Build.props", "./"]
+COPY ["Directory.Packages.props", "./"]
+COPY ["PostFundManagement.snk", "./"]
+COPY ["LICENSE", "./"]
 COPY ["PostFundManagement.Api/PostFundManagement.Api.csproj", "PostFundManagement.Api/"]
 COPY ["PostFundManagement.Application/PostFundManagement.Application.csproj", "PostFundManagement.Application/"]
 COPY ["PostFundManagement.Domain/PostFundManagement.Domain.csproj", "PostFundManagement.Domain/"]
@@ -33,4 +37,4 @@ RUN dotnet publish "PostFundManagement.Api.csproj" -c Release -o /app/publish /p
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "PostFundManagement.Api.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "PostFundManagement.Api.dll"]
diff --git a/PostFundManagement.Api/PostFundManagement.Api.csproj b/PostFundManagement.Api/PostFundManagement.Api.csproj
index ef0be7e..3098cb4 100644
--- a/PostFundManagement.Api/PostFundManagement.Api.csproj
+++ b/PostFundManagement.Api/PostFundManagement.Api.csproj
@@ -1,111 +1,63 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>59a05094-4ac2-472d-af04-3407e909432d</UserSecretsId>
-    <AssemblyOriginatorKeyFile>..\PostFundManagement.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>True</SignAssembly>
-    <PackageLicenseFile>..\LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;AV0029;AV0030;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;AV0029;AV0030;</NoWarn>
-  </PropertyGroup>
-
-  <!-- Security (IODC)-->
+  <!-- Security (OIDC) -->
   <ItemGroup>
-    <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
-    <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="IdentityModel" Version="6.2.0" />
-    <PackageReference Include="KubernetesClient" Version="19.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
-  
-    <Using Include="Microsoft.FeatureManagement" />
-    <Using Include="Microsoft.AspNetCore.Authentication" />
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <Using Include="Microsoft.IdentityModel.Tokens" />
-    <Using Include="System.Security.Claims" />
+    <PackageReference Include="IdentityModel.AspNetCore" />
+    <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" />
+    <PackageReference Include="IdentityModel" />
+    <PackageReference Include="KubernetesClient" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
   </ItemGroup>
 
   <!-- Health Checks -->
-  <ItemGroup>    
-    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
-
-    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
-    <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+  <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.UI" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
+    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" />
   </ItemGroup>
 
   <!-- API Versioning -->
   <ItemGroup>
-    <PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
-    <PackageReference Include="Asp.Versioning.Abstractions" Version="10.2.1" />
-    <PackageReference Include="Asp.Versioning.Http" Version="10.2.3" />
-    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.2.1" />
-
-    <Using Include="Asp.Versioning" />
-    <Using Include="Asp.Versioning.Builder" />
+    <PackageReference Include="AccessTokenClient.Extensions" />
+    <PackageReference Include="Asp.Versioning.Abstractions" />
+    <PackageReference Include="Asp.Versioning.Http" />
+    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" />
   </ItemGroup>
 
   <!-- API Documentation -->
-  <ItemGroup>    
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />    
-    <PackageReference Include="Scalar.AspNetCore" Version="2.17.4" />
-
-    <Using Include="Scalar.AspNetCore" />
-    <Using Include="Microsoft.OpenApi" />
-    <Using Include="Microsoft.AspNetCore.OpenApi" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Scalar.AspNetCore" />
   </ItemGroup>
 
-  <!-- file nesting -->
+  <!-- File Nesting -->
   <ItemGroup>
     <ProjectCapability Include="ConfigurableFileNesting" />
     <ProjectCapability Include="ConfigurableFileNestingFeatureEnabled" />
   </ItemGroup>
 
-  <!-- CQRS -->
+  <!-- CQRS Source Generator -->
   <ItemGroup>
-    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
+    <PackageReference Include="Mediator.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-
-    <Using Include="FluentResults" />
-    <Using Include="Mediator" />
-    <Using Include="Quartz" />
   </ItemGroup>
 
-  <!-- Shared Static Usings -->
-  <ItemGroup>    
-    <Using Static="true" Include="PostFundManagement.Application.Extensions.General" />
-    <Using Alias="Problems" Include="Microsoft.AspNetCore.Mvc.ProblemDetails" />
-  </ItemGroup>
-
-  <!-- Shared Global Usings -->
+  <!-- Project-specific Usings -->
   <ItemGroup>
-    <Using Include="System.Web" />
-    <Using Include="PostFundManagement.Domain.Attributes" />
-    <Using Include="System.Diagnostics" />
-    <Using Include="System.Reflection" />
+    <Using Alias="Problems" Include="Microsoft.AspNetCore.Mvc.ProblemDetails" />
+    <Using Include="Asp.Versioning.Builder" />
     <Using Include="Microsoft.AspNetCore.Mvc" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="System.ComponentModel.DataAnnotations" />
-    <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />    
-    <Using Include="System.Security.Cryptography.X509Certificates" />    
-    <Using Include="Microsoft.AspNetCore.DataProtection" />
-    <Using Include="Refit" />
+    <Using Include="Microsoft.FeatureManagement" />
+    <Using Include="PostFundManagement.Domain.Attributes" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PostFundManagement.Application/PostFundManagement.Application.csproj b/PostFundManagement.Application/PostFundManagement.Application.csproj
index 96108ea..c674f3c 100644
--- a/PostFundManagement.Application/PostFundManagement.Application.csproj
+++ b/PostFundManagement.Application/PostFundManagement.Application.csproj
@@ -1,105 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AssemblyOriginatorKeyFile>..\PostFundManagement.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>True</SignAssembly>
-    <PackageLicenseFile>..\LICENSE</PackageLicenseFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;AV0029;AV0030;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;AV0029;AV0030;</NoWarn>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\PostFundManagement.Domain\PostFundManagement.Domain.csproj" />
     <ProjectReference Include="..\PostFundManagement.Infrastructure\PostFundManagement.Infrastructure.csproj" />
   </ItemGroup>
 
-  <!-- API Documentation -->
+  <!-- Dependencies -->
   <ItemGroup>
-    <PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-    <PackageReference Include="Duende.AccessTokenManagement" Version="4.2.0" />
-    <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Validation" Version="10.0.12" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.17.4" />
-
-    <Using Include="Scalar.AspNetCore" />
-    <Using Include="Microsoft.OpenApi" />
-    <Using Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Castle.Core.AsyncInterceptor" />
+    <PackageReference Include="Duende.AccessTokenManagement" />
+    <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Microsoft.Extensions.Validation" />
+    <PackageReference Include="Scalar.AspNetCore" />
   </ItemGroup>
 
-  <!-- Shared Static Usings -->
+  <!-- Project-specific Usings -->
   <ItemGroup>
-    <Using Static="true" Include="PostFundManagement.Application.Extensions.General" />
-    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
-  </ItemGroup>
-
-  <!-- Shared Usings -->
-  <ItemGroup>
-    <Using Include="Humanizer" />
-    <Using Include="Duende.AccessTokenManagement.OpenIdConnect" />
-    <Using Include="Duende.AccessTokenManagement" />
     <Using Include="Castle.DynamicProxy" />
-    <Using Include="Microsoft.FeatureManagement" />
-    <Using Include="System.ComponentModel.DataAnnotations" />
+    <Using Include="Duende.AccessTokenManagement" />
+    <Using Include="Duende.AccessTokenManagement.OpenIdConnect" />
     <Using Include="Microsoft.Extensions.Caching.Distributed" />
     <Using Include="Microsoft.Extensions.Caching.Hybrid" />
+    <Using Include="Microsoft.FeatureManagement" />
     <Using Include="System.IdentityModel.Tokens.Jwt" />
-    <Using Include="Asp.Versioning" />
-    <Using Include="System.Security.Claims" />
-    <Using Include="System.Diagnostics" />
-    <Using Include="MimeKit" />
-    <Using Include="MailKit.Net.Smtp" />
-    <Using Include="Quartz" />
-    <Using Include="Refit" />
-    <Using Include="AccessTokenClient" />
-    <Using Include="Microsoft.AspNetCore.Authentication" />
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
-    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
-    <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <Using Include="Microsoft.Extensions.Configuration" />
-    <Using Include="Amazon.S3" />
-    <Using Include="Amazon.S3.Model" />
-    <Using Include="Amazon.Runtime" />
-    <Using Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore.Design" />
-    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
-    <Using Include="Mediator" />
-    <Using Include="FluentResults" />
-    <Using Include="Microsoft.AspNetCore.DataProtection" />
-    <Using Include="System.Security.Cryptography.X509Certificates" />
-    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
-    <Using Include="System.Text.Json.Serialization" />
-    <Using Include="System.Reflection" />
-    <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
-    <Using Include="Microsoft.AspNetCore.Routing" />
-    <Using Include="System.Web" />
-    <Using Include="Microsoft.IdentityModel.Tokens" />
-    <Using Include="Microsoft.AspNetCore.Http" />
-    <Using Include="HashidsNet" />
-    <Using Include="System.Net" />
-    <Using Include="System.Text.RegularExpressions" />
-    <Using Include="System.Globalization" />
-    <Using Include="Microsoft.AspNetCore.Builder" />
-    <Using Include="Microsoft.Extensions.Hosting" />
-    <Using Include="System.Text" />
-    <Using Include="System.Text.Json" />
-    <Using Include="System.Threading.Channels" />
-    <Using Include="System.Collections.ObjectModel" />
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="System.Security.Cryptography" />
-    <Using Include="Microsoft.Extensions.Options" />
-    <Using Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
 
 </Project>
diff --git a/PostFundManagement.Domain/PostFundManagement.Domain.csproj b/PostFundManagement.Domain/PostFundManagement.Domain.csproj
index 80faa44..8e3861b 100644
--- a/PostFundManagement.Domain/PostFundManagement.Domain.csproj
+++ b/PostFundManagement.Domain/PostFundManagement.Domain.csproj
@@ -1,141 +1,97 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AssemblyOriginatorKeyFile>..\PostFundManagement.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>True</SignAssembly>
-    <PackageLicenseFile>..\LICENSE</PackageLicenseFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;MA0048;MA0051</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;MA0048;MA0051</NoWarn>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- Transformation -->
   <ItemGroup>
-    <PackageReference Include="Humanizer" Version="3.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.12" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.7.0" />
-    <PackageReference Include="Scrutor" Version="7.0.0" />
-
-    <Using Include="Humanizer" />
+    <PackageReference Include="Humanizer" />
+    <PackageReference Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" />
+    <PackageReference Include="Scrutor" />
   </ItemGroup>
 
-  <!-- Security (IODC)-->
+  <!-- Security (OIDC) -->
   <ItemGroup>
-    <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
-    <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="IdentityModel" Version="6.2.0" />
-    <PackageReference Include="KubernetesClient" Version="19.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.10.0" />
-    <PackageReference Include="Polly" Version="8.8.0" />
-    <PackageReference Include="Polly.Extensions" Version="8.8.0" />
-
-    <Using Include="System.Security.Claims" />
-    <Using Include="AccessTokenClient" />
-    <Using Include="Microsoft.AspNetCore.Authentication" />
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
-    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
-    <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="IdentityModel.AspNetCore" />
+    <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" />
+    <PackageReference Include="IdentityModel" />
+    <PackageReference Include="KubernetesClient" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
+    <PackageReference Include="Polly" />
+    <PackageReference Include="Polly.Extensions" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
 
-  <!-- API SDK Composer-->
+  <!-- API SDK Composer -->
   <ItemGroup>
-    <PackageReference Include="Refit.HttpClientFactory" Version="15.2.0" />
-
-    <Using Include="Refit" />
+    <PackageReference Include="Refit.HttpClientFactory" />
   </ItemGroup>
 
   <!-- API Versioning -->
   <ItemGroup>
-    <PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
-    <PackageReference Include="Asp.Versioning.Abstractions" Version="10.2.1" />
-    <PackageReference Include="Asp.Versioning.Http" Version="10.2.3" />
-    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.2.1" />
-
-    <Using Include="Asp.Versioning" />
+    <PackageReference Include="AccessTokenClient.Extensions" />
+    <PackageReference Include="Asp.Versioning.Abstractions" />
+    <PackageReference Include="Asp.Versioning.Http" />
+    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" />
   </ItemGroup>
 
   <!-- API Documentation -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.17.4" />
-
-    <Using Include="Scalar.AspNetCore" />
-    <Using Include="Microsoft.OpenApi" />
-    <Using Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Scalar.AspNetCore" />
   </ItemGroup>
 
-  <!-- Quartz Scheduler-->
+  <!-- Quartz Scheduler -->
   <ItemGroup>
-    <PackageReference Include="Hashids.net" Version="1.7.0" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.259">
+    <PackageReference Include="Hashids.net" />
+    <PackageReference Include="Meziantou.Analyzer">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenTelemetry" Version="1.18.0" />
-    <PackageReference Include="Quartz" Version="4.1.0" />
-    <PackageReference Include="Quartz.Plugins" Version="4.1.0" />
-    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="4.1.0" />
-    <PackageReference Include="Quartz.Serialization.SystemTextJson" Version="4.1.0" />
-    <PackageReference Include="Quartz.AspNetCore" Version="4.1.0" />
-    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="4.1.0" />
-
-    <!-- Global Usings -->
-    <Using Include="Quartz" />
+    <PackageReference Include="OpenTelemetry" />
+    <PackageReference Include="Quartz" />
+    <PackageReference Include="Quartz.Plugins" />
+    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" />
+    <PackageReference Include="Quartz.Serialization.SystemTextJson" />
+    <PackageReference Include="Quartz.AspNetCore" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <!-- Configuration -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
-
-    <!-- Global Usings -->
-    <Using Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
   </ItemGroup>
 
   <!-- Health Checks -->
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.12" />
-
-    <!-- Global Usings -->
-    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
-    <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Data" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
   </ItemGroup>
 
   <!-- Open Telemetry -->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.18.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.18.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" />
 
-    <!-- Global Usings -->
+    <!-- Project-specific Usings -->
     <Using Include="OpenTelemetry.Resources" />
     <Using Include="OpenTelemetry.Exporter" />
     <Using Include="OpenTelemetry.Logs" />
@@ -145,90 +101,40 @@
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.12">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.12" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
 
-    <!-- Global Usings -->
+    <!-- Project-specific Usings -->
     <Using Include="Npgsql" />
-    <Using Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore.Design" />
-    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
+    <Using Include="System.ComponentModel.DataAnnotations.Schema" />
   </ItemGroup>
 
   <!-- Email -->
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.18.0" />
-    <PackageReference Include="MimeKit" Version="4.18.0" />
-
-    <!-- Global Usings-->
-    <Using Include="MimeKit" />
-    <Using Include="MailKit.Net.Smtp" />
+    <PackageReference Include="MailKit" />
+    <PackageReference Include="MimeKit" />
   </ItemGroup>
 
   <!-- CQRS -->
   <ItemGroup>
-    <PackageReference Include="FluentResults" Version="4.0.0" />
-    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
-
-    <!-- Global Usings -->
-    <Using Include="FluentResults" />
-    <Using Include="Mediator" />
+    <PackageReference Include="FluentResults" />
+    <PackageReference Include="Mediator.Abstractions" />
   </ItemGroup>
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.101.4" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.103.3" />
-
-    <!-- global Usings -->
-    <Using Include="Amazon.S3" />
-    <Using Include="Amazon.S3.Model" />
-    <Using Include="Amazon.Runtime" />
-  </ItemGroup>
-
-  <!-- Shared Static Usings -->
-  <ItemGroup>
-    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
-  </ItemGroup>
-
-  <!-- Shared Usings -->
-  <ItemGroup>
-    <Using Include="System.ComponentModel.DataAnnotations.Schema" />
-    <Using Include="Microsoft.AspNetCore.DataProtection" />
-    <Using Include="System.Security.Cryptography.X509Certificates" />
-    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
-    <Using Include="System.Text.Json.Serialization" />
-    <Using Include="System.Reflection" />
-    <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
-    <Using Include="Microsoft.AspNetCore.Routing" />
-    <Using Include="System.Web" />
-    <Using Include="Microsoft.IdentityModel.Tokens" />
-    <Using Include="Microsoft.AspNetCore.Http" />
-    <Using Include="HashidsNet" />
-    <Using Include="System.Net" />
-    <Using Include="System.Text.RegularExpressions" />
-    <Using Include="System.Globalization" />
-    <Using Include="Microsoft.AspNetCore.Builder" />
-    <Using Include="Microsoft.Extensions.Hosting" />
-    <Using Include="System.Text" />
-    <Using Include="System.Text.Json" />
-    <Using Include="System.Threading.Channels" />
-    <Using Include="System.Collections.ObjectModel" />
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="System.Security.Cryptography" />
-    <Using Include="Microsoft.Extensions.Options" />
-    <Using Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" />
+    <PackageReference Include="AWSSDK.S3" />
   </ItemGroup>
 
 </Project>
diff --git a/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj b/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj
index 6451b3a..b10afa1 100644
--- a/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj
+++ b/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj
@@ -1,56 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <UserSecretsId>c4131f8d-ff78-432e-86d2-f6e131bd4cd3</UserSecretsId>
-    <AssemblyOriginatorKeyFile>..\PostFundManagement.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>True</SignAssembly>
-    <PackageLicenseFile>..\LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Duende.AccessTokenManagement" Version="4.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12">
+    <PackageReference Include="Duende.AccessTokenManagement" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.12">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
-
-    <Using Include="Refit" />
-    <Using Include="FluentResults" />
-    <Using Include="System.Reflection" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.EntityFrameworkCore.Design" />
-  </ItemGroup>
-
-  <!-- Shared Static Usings -->
-  <ItemGroup>
-    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
   </ItemGroup>
 
   <!-- Extensions -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
 
-    <Using Include="Microsoft.OpenApi" />
-    <Using Include="Microsoft.AspNetCore.OpenApi" />
-    <Using Include="Microsoft.AspNetCore.Http" />
+    <!-- Project-specific Usings -->
     <Using Include="System.Net.Http.Json" />
-    <Using Include="Microsoft.Extensions.Configuration" />
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PostFundManagement.Tests/PostFundManagement.Tests.csproj b/PostFundManagement.Tests/PostFundManagement.Tests.csproj
index 7e7e4ae..ad5d1ae 100644
--- a/PostFundManagement.Tests/PostFundManagement.Tests.csproj
+++ b/PostFundManagement.Tests/PostFundManagement.Tests.csproj
@@ -1,9 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <UserSecretsId>079fcde1-9b10-4402-9624-5f0827b4dbfd</UserSecretsId>
   </PropertyGroup>
@@ -17,18 +14,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
+  <!-- Project-specific Usings -->
   <ItemGroup>
     <Using Include="Xunit" />
-    <Using Include="Microsoft.Extensions.Configuration" />
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="System.Reflection" />
-    <Using Include="System.Diagnostics" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,4 +31,4 @@
     <ProjectReference Include="..\PostFundManagement.Domain\PostFundManagement.Domain.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PostFundManagement.slnx b/PostFundManagement.slnx
index 169329b..c87187f 100644
--- a/PostFundManagement.slnx
+++ b/PostFundManagement.slnx
@@ -2,6 +2,8 @@
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
     <File Path=".gitignore" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
     <File Path="docker-compose.yml" />
     <File Path="LICENSE" />
     <File Path="PostFundManagement.snk" />