From 35225b2bb9c93bed128594f6e9b44587aec5a146 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Tue, 20 Apr 2021 17:29:24 +0300
Subject: [PATCH] Move SqlServer databases into a separate project

---
 .../LocalDbDatabase.cs                            |  3 +--
 .../Oqtane.Database.SqlServer.csproj              | 15 +++++++++++++++
 .../SqlServerDatabase.cs                          |  5 +----
 .../SqlServerDatabaseBase.cs                      |  2 --
 Oqtane.Server/Oqtane.Server.csproj                |  2 +-
 Oqtane.sln                                        | 12 +++++++++---
 6 files changed, 27 insertions(+), 12 deletions(-)
 rename {Oqtane.Server/Databases => Oqtane.Database.SqlServer}/LocalDbDatabase.cs (95%)
 create mode 100644 Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
 rename {Oqtane.Server/Databases => Oqtane.Database.SqlServer}/SqlServerDatabase.cs (94%)
 rename {Oqtane.Server/Databases => Oqtane.Database.SqlServer}/SqlServerDatabaseBase.cs (95%)

diff --git a/Oqtane.Server/Databases/LocalDbDatabase.cs b/Oqtane.Database.SqlServer/LocalDbDatabase.cs
similarity index 95%
rename from Oqtane.Server/Databases/LocalDbDatabase.cs
rename to Oqtane.Database.SqlServer/LocalDbDatabase.cs
index 77be3035..e2de5b7b 100644
--- a/Oqtane.Server/Databases/LocalDbDatabase.cs
+++ b/Oqtane.Database.SqlServer/LocalDbDatabase.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Oqtane.Models;
-using Oqtane.Repository.Databases;
 
-namespace Oqtane.Databases
+namespace Oqtane.Repository.Databases
 {
     public class LocalDbDatabase : SqlServerDatabaseBase
     {
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
new file mode 100644
index 00000000..c61607a7
--- /dev/null
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/Oqtane.Server/Databases/SqlServerDatabase.cs b/Oqtane.Database.SqlServer/SqlServerDatabase.cs
similarity index 94%
rename from Oqtane.Server/Databases/SqlServerDatabase.cs
rename to Oqtane.Database.SqlServer/SqlServerDatabase.cs
index cfb852c3..ee194507 100644
--- a/Oqtane.Server/Databases/SqlServerDatabase.cs
+++ b/Oqtane.Database.SqlServer/SqlServerDatabase.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Oqtane.Models;
-using Oqtane.Repository.Databases;
 
-// ReSharper disable ArrangeObjectCreationWhenTypeNotEvident
-
-namespace Oqtane.Databases
+namespace Oqtane.Repository.Databases
 {
     public class SqlServerDatabase : SqlServerDatabaseBase
     {
diff --git a/Oqtane.Server/Databases/SqlServerDatabaseBase.cs b/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs
similarity index 95%
rename from Oqtane.Server/Databases/SqlServerDatabaseBase.cs
rename to Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs
index 70d3de3a..c1d87689 100644
--- a/Oqtane.Server/Databases/SqlServerDatabaseBase.cs
+++ b/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs
@@ -2,8 +2,6 @@ using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
-using Oqtane.Databases;
-using Oqtane.Interfaces;
 using Oqtane.Models;
 using Oqtane.Shared;
 
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 5f937608..396e43b3 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -57,7 +57,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
@@ -67,6 +66,7 @@
     <ProjectReference Include="..\Oqtane.Database.MySQL\Oqtane.Database.MySQL.csproj" />
     <ProjectReference Include="..\Oqtane.Database.PostgreSQL\Oqtane.Database.PostgreSQL.csproj" />
     <ProjectReference Include="..\Oqtane.Database.Sqlite\Oqtane.Database.Sqlite.csproj" />
+    <ProjectReference Include="..\Oqtane.Database.SqlServer\Oqtane.Database.SqlServer.csproj" />
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
     <ProjectReference Include="..\Oqtane.Upgrade\Oqtane.Upgrade.csproj" />
   </ItemGroup>
diff --git a/Oqtane.sln b/Oqtane.sln
index 9548b9c6..56aec43f 100644
--- a/Oqtane.sln
+++ b/Oqtane.sln
@@ -20,11 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Database.MySQL", "Oqtane.Database.MySQL\Oqtane.Database.MySQL.csproj", "{A996FD2D-DAC8-4DFA-92B2-51DF32C6E014}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.MySQL", "Oqtane.Database.MySQL\Oqtane.Database.MySQL.csproj", "{A996FD2D-DAC8-4DFA-92B2-51DF32C6E014}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Database.PostgreSQL", "Oqtane.Database.PostgreSQL\Oqtane.Database.PostgreSQL.csproj", "{3B29B35F-65E7-4819-9AED-EAC7FCFA309B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.PostgreSQL", "Oqtane.Database.PostgreSQL\Oqtane.Database.PostgreSQL.csproj", "{3B29B35F-65E7-4819-9AED-EAC7FCFA309B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Database.Sqlite", "Oqtane.Database.Sqlite\Oqtane.Database.Sqlite.csproj", "{E4F50CA9-19A6-465A-9469-C033748AD95B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.Sqlite", "Oqtane.Database.Sqlite\Oqtane.Database.Sqlite.csproj", "{E4F50CA9-19A6-465A-9469-C033748AD95B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.SqlServer", "Oqtane.Database.SqlServer\Oqtane.Database.SqlServer.csproj", "{033DCA37-6354-4A3D-8250-4EC20740EE19}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,6 +66,10 @@ Global
 		{E4F50CA9-19A6-465A-9469-C033748AD95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4F50CA9-19A6-465A-9469-C033748AD95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4F50CA9-19A6-465A-9469-C033748AD95B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE