From c5d2b7c25162a0b19209ef870d7460ef3a933ae3 Mon Sep 17 00:00:00 2001
From: Ske <voltasalt@gmail.com>
Date: Wed, 8 May 2019 00:06:27 +0200
Subject: [PATCH] refactor project structure

---
 {PluralKit/Bot => PluralKit.Bot}/Bot.cs       |  0
 .../Commands/MemberCommands.cs                |  0
 .../Commands/MiscCommands.cs                  |  0
 .../Commands/SystemCommands.cs                |  0
 .../Bot => PluralKit.Bot}/ContextUtils.cs     |  0
 {PluralKit/Bot => PluralKit.Bot}/Errors.cs    |  0
 {PluralKit/Bot => PluralKit.Bot}/Limits.cs    |  0
 PluralKit.Bot/PluralKit.Bot.csproj            | 18 +++++++++++++++
 .../Bot => PluralKit.Bot}/Preconditions.cs    |  0
 .../Services/EmbedService.cs                  |  0
 .../Services/LogChannelService.cs             |  0
 .../Services/ProxyService.cs                  |  0
 {PluralKit/Bot => PluralKit.Bot}/Utils.cs     |  0
 {PluralKit => PluralKit.Core}/Models.cs       |  0
 PluralKit.Core/PluralKit.Core.csproj          | 13 +++++++++++
 {PluralKit => PluralKit.Core}/Schema.cs       |  0
 {PluralKit => PluralKit.Core}/Stores.cs       |  0
 {PluralKit => PluralKit.Core}/TaskUtils.cs    |  0
 {PluralKit => PluralKit.Core}/Utils.cs        | 10 +--------
 PluralKit.csproj                              | 16 --------------
 PluralKit.sln                                 | 22 +++++++++++++++++++
 21 files changed, 54 insertions(+), 25 deletions(-)
 rename {PluralKit/Bot => PluralKit.Bot}/Bot.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Commands/MemberCommands.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Commands/MiscCommands.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Commands/SystemCommands.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/ContextUtils.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Errors.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Limits.cs (100%)
 create mode 100644 PluralKit.Bot/PluralKit.Bot.csproj
 rename {PluralKit/Bot => PluralKit.Bot}/Preconditions.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Services/EmbedService.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Services/LogChannelService.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Services/ProxyService.cs (100%)
 rename {PluralKit/Bot => PluralKit.Bot}/Utils.cs (100%)
 rename {PluralKit => PluralKit.Core}/Models.cs (100%)
 create mode 100644 PluralKit.Core/PluralKit.Core.csproj
 rename {PluralKit => PluralKit.Core}/Schema.cs (100%)
 rename {PluralKit => PluralKit.Core}/Stores.cs (100%)
 rename {PluralKit => PluralKit.Core}/TaskUtils.cs (100%)
 rename {PluralKit => PluralKit.Core}/Utils.cs (79%)
 delete mode 100644 PluralKit.csproj
 create mode 100644 PluralKit.sln

diff --git a/PluralKit/Bot/Bot.cs b/PluralKit.Bot/Bot.cs
similarity index 100%
rename from PluralKit/Bot/Bot.cs
rename to PluralKit.Bot/Bot.cs
diff --git a/PluralKit/Bot/Commands/MemberCommands.cs b/PluralKit.Bot/Commands/MemberCommands.cs
similarity index 100%
rename from PluralKit/Bot/Commands/MemberCommands.cs
rename to PluralKit.Bot/Commands/MemberCommands.cs
diff --git a/PluralKit/Bot/Commands/MiscCommands.cs b/PluralKit.Bot/Commands/MiscCommands.cs
similarity index 100%
rename from PluralKit/Bot/Commands/MiscCommands.cs
rename to PluralKit.Bot/Commands/MiscCommands.cs
diff --git a/PluralKit/Bot/Commands/SystemCommands.cs b/PluralKit.Bot/Commands/SystemCommands.cs
similarity index 100%
rename from PluralKit/Bot/Commands/SystemCommands.cs
rename to PluralKit.Bot/Commands/SystemCommands.cs
diff --git a/PluralKit/Bot/ContextUtils.cs b/PluralKit.Bot/ContextUtils.cs
similarity index 100%
rename from PluralKit/Bot/ContextUtils.cs
rename to PluralKit.Bot/ContextUtils.cs
diff --git a/PluralKit/Bot/Errors.cs b/PluralKit.Bot/Errors.cs
similarity index 100%
rename from PluralKit/Bot/Errors.cs
rename to PluralKit.Bot/Errors.cs
diff --git a/PluralKit/Bot/Limits.cs b/PluralKit.Bot/Limits.cs
similarity index 100%
rename from PluralKit/Bot/Limits.cs
rename to PluralKit.Bot/Limits.cs
diff --git a/PluralKit.Bot/PluralKit.Bot.csproj b/PluralKit.Bot/PluralKit.Bot.csproj
new file mode 100644
index 00000000..4c7c476f
--- /dev/null
+++ b/PluralKit.Bot/PluralKit.Bot.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>netcoreapp2.2</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\PluralKit.Core\PluralKit.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Discord.Net.Commands" Version="2.0.1" />
+      <PackageReference Include="Discord.Net.Webhook" Version="2.0.1" />
+      <PackageReference Include="Discord.Net.WebSocket" Version="2.0.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/PluralKit/Bot/Preconditions.cs b/PluralKit.Bot/Preconditions.cs
similarity index 100%
rename from PluralKit/Bot/Preconditions.cs
rename to PluralKit.Bot/Preconditions.cs
diff --git a/PluralKit/Bot/Services/EmbedService.cs b/PluralKit.Bot/Services/EmbedService.cs
similarity index 100%
rename from PluralKit/Bot/Services/EmbedService.cs
rename to PluralKit.Bot/Services/EmbedService.cs
diff --git a/PluralKit/Bot/Services/LogChannelService.cs b/PluralKit.Bot/Services/LogChannelService.cs
similarity index 100%
rename from PluralKit/Bot/Services/LogChannelService.cs
rename to PluralKit.Bot/Services/LogChannelService.cs
diff --git a/PluralKit/Bot/Services/ProxyService.cs b/PluralKit.Bot/Services/ProxyService.cs
similarity index 100%
rename from PluralKit/Bot/Services/ProxyService.cs
rename to PluralKit.Bot/Services/ProxyService.cs
diff --git a/PluralKit/Bot/Utils.cs b/PluralKit.Bot/Utils.cs
similarity index 100%
rename from PluralKit/Bot/Utils.cs
rename to PluralKit.Bot/Utils.cs
diff --git a/PluralKit/Models.cs b/PluralKit.Core/Models.cs
similarity index 100%
rename from PluralKit/Models.cs
rename to PluralKit.Core/Models.cs
diff --git a/PluralKit.Core/PluralKit.Core.csproj b/PluralKit.Core/PluralKit.Core.csproj
new file mode 100644
index 00000000..54d15f28
--- /dev/null
+++ b/PluralKit.Core/PluralKit.Core.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.2</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Dapper" Version="1.60.6" />
+      <PackageReference Include="Dapper.Contrib" Version="1.60.1" />
+      <PackageReference Include="Npgsql" Version="4.0.6" />
+    </ItemGroup>
+
+</Project>
diff --git a/PluralKit/Schema.cs b/PluralKit.Core/Schema.cs
similarity index 100%
rename from PluralKit/Schema.cs
rename to PluralKit.Core/Schema.cs
diff --git a/PluralKit/Stores.cs b/PluralKit.Core/Stores.cs
similarity index 100%
rename from PluralKit/Stores.cs
rename to PluralKit.Core/Stores.cs
diff --git a/PluralKit/TaskUtils.cs b/PluralKit.Core/TaskUtils.cs
similarity index 100%
rename from PluralKit/TaskUtils.cs
rename to PluralKit.Core/TaskUtils.cs
diff --git a/PluralKit/Utils.cs b/PluralKit.Core/Utils.cs
similarity index 79%
rename from PluralKit/Utils.cs
rename to PluralKit.Core/Utils.cs
index 75b5864f..efffffe1 100644
--- a/PluralKit/Utils.cs
+++ b/PluralKit.Core/Utils.cs
@@ -1,13 +1,5 @@
 using System;
-using System.Data;
-using System.Threading;
-using System.Threading.Tasks;
-using Dapper;
-using Discord;
-using Discord.Commands;
-using Discord.Commands.Builders;
-using Discord.WebSocket;
-using Microsoft.Extensions.DependencyInjection;
+
 
 namespace PluralKit
 {
diff --git a/PluralKit.csproj b/PluralKit.csproj
deleted file mode 100644
index 2d568ed3..00000000
--- a/PluralKit.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="1.60.1" />
-    <PackageReference Include="Dapper.Contrib" Version="1.60.1" />
-    <PackageReference Include="Discord.Net" Version="2.0.1" />
-    <PackageReference Include="Npgsql" Version="4.0.4" />
-    <PackageReference Include="Npgsql.Json.NET" Version="4.0.4" />
-  </ItemGroup>
-
-</Project>
diff --git a/PluralKit.sln b/PluralKit.sln
new file mode 100644
index 00000000..afa744d5
--- /dev/null
+++ b/PluralKit.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Bot", "PluralKit.Bot\PluralKit.Bot.csproj", "{F2C5562D-FD96-4C11-B54E-93737D127959}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Core", "PluralKit.Core\PluralKit.Core.csproj", "{5DBE037D-179D-4C05-8A28-35E37129C961}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F2C5562D-FD96-4C11-B54E-93737D127959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2C5562D-FD96-4C11-B54E-93737D127959}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2C5562D-FD96-4C11-B54E-93737D127959}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2C5562D-FD96-4C11-B54E-93737D127959}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DBE037D-179D-4C05-8A28-35E37129C961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DBE037D-179D-4C05-8A28-35E37129C961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DBE037D-179D-4C05-8A28-35E37129C961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DBE037D-179D-4C05-8A28-35E37129C961}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal