From e41b0af16fe1b24986febce94d2018e188c687e0 Mon Sep 17 00:00:00 2001
From: Ali Yousefi <ali.visual.studio@gmail.com>
Date: Thu, 1 Feb 2024 20:53:42 +0330
Subject: [PATCH] update package structures

---
 ...ces.ContentsMicroservice.ConsoleApp.csproj | 17 +++++++--
 ...vices.ContentsMicroservice.Database.csproj | 29 +++++++++++++--
 ...ervices.ContentsMicroservice.Domain.csproj | 18 ++++++++--
 ...ervices.ContentsMicroservice.Logics.csproj | 16 +++++++--
 ...rvices.ContentsMicroservice.StartUp.csproj | 29 +++++++++++++--
 ...ervices.ContentsMicroservice.WebApi.csproj | 35 +++++++++++++++++--
 ...vices.ContentsMicroservice.Services.csproj | 18 +++++++---
 7 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.ConsoleApp/EasyMicroservices.ContentsMicroservice.ConsoleApp.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.ConsoleApp/EasyMicroservices.ContentsMicroservice.ConsoleApp.csproj
index f02677b..81f1fe1 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.ConsoleApp/EasyMicroservices.ContentsMicroservice.ConsoleApp.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.ConsoleApp/EasyMicroservices.ContentsMicroservice.ConsoleApp.csproj
@@ -1,10 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
index ba719bf..a0b4543 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
@@ -1,7 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EasyMicroservices.ContentsMicroservice</RootNamespace>
   </PropertyGroup>
 
@@ -12,7 +24,18 @@
   
   <ItemGroup>
 	  <PackageReference Include="EasyMicroservices.Configuration" Version="*" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
+  </ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj
index 761de4b..c41117e 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj
@@ -1,7 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EasyMicroservices.ContentsMicroservice</RootNamespace>
   </PropertyGroup>
 
@@ -12,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.1.43" />
+    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.1.45" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj
index 87a4d0c..55f8bda 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj
@@ -1,7 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EasyMicroservices.ContentsMicroservice</RootNamespace>
   </PropertyGroup>
   
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
index 1feff5c..497ebb5 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
@@ -1,15 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EasyMicroservices.ContentsMicroservice</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
   </ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+  </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.26" />
+  </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\EasyMicroservicesContentsMicroservice.Services\EasyMicroservices.ContentsMicroservice.Services.csproj" />
   </ItemGroup>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj b/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj
index 848ce47..91b3b21 100644
--- a/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj
+++ b/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj
@@ -1,18 +1,47 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="*" />
+  </ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="*" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.26">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\EasyMicroservices.ContentsMicroservice.StartUp\EasyMicroservices.ContentsMicroservice.StartUp.csproj" />
   </ItemGroup>
diff --git a/src/CSharp/EasyMicroservicesContentsMicroservice.Services/EasyMicroservices.ContentsMicroservice.Services.csproj b/src/CSharp/EasyMicroservicesContentsMicroservice.Services/EasyMicroservices.ContentsMicroservice.Services.csproj
index 75a2aa7..f84656e 100644
--- a/src/CSharp/EasyMicroservicesContentsMicroservice.Services/EasyMicroservices.ContentsMicroservice.Services.csproj
+++ b/src/CSharp/EasyMicroservicesContentsMicroservice.Services/EasyMicroservices.ContentsMicroservice.Services.csproj
@@ -1,7 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EasyMicroservices.ContentsMicroservice</RootNamespace>
   </PropertyGroup>
 
@@ -9,6 +21,4 @@
     <ProjectReference Include="..\EasyMicroservices.ContentsMicroservice.Logics\EasyMicroservices.ContentsMicroservice.Logics.csproj" />
   </ItemGroup>
 
-
-
 </Project>