From 5e9f910661e2bc971d6b71fa173ec35e585bd92c Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Sat, 9 Sep 2023 11:29:08 -0500
Subject: [PATCH] resove conflicts

---
 src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj | 11 ++++++-----
 .../BotSharpServiceCollectionExtensions.cs            |  2 --
 src/WebStarter/appsettings.json                       |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
index ec8e2f2c..cc807aee 100644
--- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
+++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -57,10 +57,16 @@
 
   <ItemGroup>
     <Compile Remove="Accounts\**" />
+    <Compile Remove="Functions\**" />
+    <Compile Remove="Hooks\**" />
     <Compile Remove="Repository\Abstraction\**" />
     <EmbeddedResource Remove="Accounts\**" />
+    <EmbeddedResource Remove="Functions\**" />
+    <EmbeddedResource Remove="Hooks\**" />
     <EmbeddedResource Remove="Repository\Abstraction\**" />
     <None Remove="Accounts\**" />
+    <None Remove="Functions\**" />
+    <None Remove="Hooks\**" />
     <None Remove="Repository\Abstraction\**" />
   </ItemGroup>
 
@@ -86,9 +92,4 @@
     <ProjectReference Include="..\BotSharp.Abstraction\BotSharp.Abstraction.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Functions\" />
-    <Folder Include="Hooks\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs b/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs
index afe88f94..7d5e4d4c 100644
--- a/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs
+++ b/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs
@@ -1,7 +1,5 @@
 using BotSharp.Abstraction.Functions;
 using BotSharp.Abstraction.Repositories;
-using BotSharp.Core.Functions;
-using BotSharp.Core.Hooks;
 using BotSharp.Core.Routing;
 using BotSharp.Core.Templating;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
index ec67620f..a52e92a7 100644
--- a/src/WebStarter/appsettings.json
+++ b/src/WebStarter/appsettings.json
@@ -98,6 +98,7 @@
 
   "PluginLoader": {
     "Assemblies": [
+      "BotSharp.Plugin.MongoStorage",
       "BotSharp.Core",
       "BotSharp.Plugin.AzureOpenAI",
       "BotSharp.Plugin.MetaAI",