From 3aa2f33f74e071bb4949015a4593e413b3d94a36 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 9 May 2026 06:11:48 +0300 Subject: [PATCH 1/4] Move TFM to Directory.Build.props --- DashboardApplication/DashboardApplication.csproj | 5 ----- Directory.Build.props | 8 +++++--- ModularApplication/ModularApplication.csproj | 7 +------ Module1/Module1.csproj | 13 +------------ Module2/Module2.csproj | 4 ++-- .../MultiTenantApplication.csproj | 7 +------ 6 files changed, 10 insertions(+), 34 deletions(-) diff --git a/DashboardApplication/DashboardApplication.csproj b/DashboardApplication/DashboardApplication.csproj index 5b0ae3d..b30053a 100644 --- a/DashboardApplication/DashboardApplication.csproj +++ b/DashboardApplication/DashboardApplication.csproj @@ -1,10 +1,5 @@  - - net8.0 - enable - - diff --git a/Directory.Build.props b/Directory.Build.props index 57cbcdb..560269b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,9 @@ - - 2.2.1 - + + net10.0 + enable + 2.2.1 + diff --git a/ModularApplication/ModularApplication.csproj b/ModularApplication/ModularApplication.csproj index 6e21e75..5b2d421 100644 --- a/ModularApplication/ModularApplication.csproj +++ b/ModularApplication/ModularApplication.csproj @@ -1,12 +1,7 @@  - - net8.0 - enable - - - + diff --git a/Module1/Module1.csproj b/Module1/Module1.csproj index 1f5be77..37b357f 100644 --- a/Module1/Module1.csproj +++ b/Module1/Module1.csproj @@ -1,24 +1,13 @@  - net8.0 Library true 1.0.4 - - - - - - true - PreserveNewest - - - - + diff --git a/Module2/Module2.csproj b/Module2/Module2.csproj index 1a6eb50..7c51966 100644 --- a/Module2/Module2.csproj +++ b/Module2/Module2.csproj @@ -1,11 +1,11 @@ - + - net8.0 Library + diff --git a/MultiTenantApplication/MultiTenantApplication.csproj b/MultiTenantApplication/MultiTenantApplication.csproj index 7405a47..ca392ef 100644 --- a/MultiTenantApplication/MultiTenantApplication.csproj +++ b/MultiTenantApplication/MultiTenantApplication.csproj @@ -1,12 +1,7 @@  - - net8.0 - enable - - - + From 0ddbbfc299d09e7043c579b59ad3124280776b5e Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 9 May 2026 06:12:55 +0300 Subject: [PATCH 2/4] Revert changes in ModularApplication.csproj --- ModularApplication/ModularApplication.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModularApplication/ModularApplication.csproj b/ModularApplication/ModularApplication.csproj index 5b2d421..cbda885 100644 --- a/ModularApplication/ModularApplication.csproj +++ b/ModularApplication/ModularApplication.csproj @@ -1,7 +1,7 @@  - + From 2bd2b817e471881473bb32124bedbf83125a001b Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 9 May 2026 06:18:26 +0300 Subject: [PATCH 3/4] Revert --- Module2/Module2.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Module2/Module2.csproj b/Module2/Module2.csproj index 7c51966..3476883 100644 --- a/Module2/Module2.csproj +++ b/Module2/Module2.csproj @@ -5,7 +5,6 @@ - From 56a79f2924b56d67eb2c45b1d61512fc3030838f Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 9 May 2026 06:19:53 +0300 Subject: [PATCH 4/4] Remove changes from another branch --- Directory.Build.props | 2 +- MultiTenantApplication/MultiTenantApplication.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 560269b..f472b00 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net10.0 + net8.0 enable 2.2.1 diff --git a/MultiTenantApplication/MultiTenantApplication.csproj b/MultiTenantApplication/MultiTenantApplication.csproj index ca392ef..fe6b764 100644 --- a/MultiTenantApplication/MultiTenantApplication.csproj +++ b/MultiTenantApplication/MultiTenantApplication.csproj @@ -1,7 +1,7 @@  - +