From 6330335b5da8578ff9213a6354e0d86069edc904 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 1 Sep 2023 16:17:57 -0500
Subject: [PATCH] sync with master

---
 BotSharp.sln                                     | 16 +++++++++++++++-
 .../BotSharp.Core/BotSharp.Core.csproj           |  7 +++----
 .../BotSharp.Plugin.MongoStorage.csproj}         |  0
 .../Collections/AgentCollection.cs               |  0
 .../Collections/ConversationCollection.cs        |  0
 .../Collections/UserAgentCollection.cs           |  0
 .../Collections/UserCollection.cs                |  0
 .../MongoBase.cs                                 |  0
 .../MongoDbContext.cs                            |  0
 .../MongoRepositoryPlugin.cs                     |  0
 .../Repository/MongoRepository.cs                |  0
 .../Using.cs                                     |  0
 src/WebStarter/WebStarter.csproj                 |  1 +
 13 files changed, 19 insertions(+), 5 deletions(-)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository/BotSharp.Plugin.Mongo.csproj => BotSharp.Plugin.MongoStorage/BotSharp.Plugin.MongoStorage.csproj} (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Collections/AgentCollection.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Collections/ConversationCollection.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Collections/UserAgentCollection.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Collections/UserCollection.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/MongoBase.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/MongoDbContext.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/MongoRepositoryPlugin.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Repository/MongoRepository.cs (100%)
 rename src/Plugins/{BotSharp.Plugin.MongoRepository => BotSharp.Plugin.MongoStorage}/Using.cs (100%)

diff --git a/BotSharp.sln b/BotSharp.sln
index 1d78c41a..22f2e6a4 100644
--- a/BotSharp.sln
+++ b/BotSharp.sln
@@ -51,7 +51,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.PizzaBot",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{51AFE054-AE99-497D-A593-69BAEFB5106F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.RoutingSpeeder", "src\Plugins\BotSharp.Plugin.RoutingSpeeder\BotSharp.Plugin.RoutingSpeeder.csproj", "{631D9C12-86C4-44F0-99C3-D32C0754BF37}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.RoutingSpeeder", "src\Plugins\BotSharp.Plugin.RoutingSpeeder\BotSharp.Plugin.RoutingSpeeder.csproj", "{631D9C12-86C4-44F0-99C3-D32C0754BF37}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStorages", "DataStorages", "{5CD330E1-9E5A-4112-8346-6E31CA98EF78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.MongoStorage", "src\Plugins\BotSharp.Plugin.MongoRepository\BotSharp.Plugin.MongoStorage.csproj", "{5AEB21CB-02C1-4678-91FA-554EC55E9467}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -189,6 +193,14 @@ Global
 		{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|x64.ActiveCfg = Release|Any CPU
 		{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|x64.Build.0 = Release|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Debug|x64.Build.0 = Debug|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Release|x64.ActiveCfg = Release|Any CPU
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -215,6 +227,8 @@ Global
 		{A1118A2C-C6D7-4E22-9462-964AEC7CC46E} = {32FAFFFE-A4CB-4FEE-BF7C-84518BBC6DCC}
 		{51AFE054-AE99-497D-A593-69BAEFB5106F} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
 		{631D9C12-86C4-44F0-99C3-D32C0754BF37} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
+		{5CD330E1-9E5A-4112-8346-6E31CA98EF78} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
+		{5AEB21CB-02C1-4678-91FA-554EC55E9467} = {5CD330E1-9E5A-4112-8346-6E31CA98EF78}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A9969D89-C98B-40A5-A12B-FC87E55B3A19}
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
index 21f5e111..0d089123 100644
--- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
+++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -57,8 +57,11 @@
 
   <ItemGroup>
     <Compile Remove="Accounts\**" />
+    <Compile Remove="Repository\Abstraction\**" />
     <EmbeddedResource Remove="Accounts\**" />
+    <EmbeddedResource Remove="Repository\Abstraction\**" />
     <None Remove="Accounts\**" />
+    <None Remove="Repository\Abstraction\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -83,8 +86,4 @@
     <ProjectReference Include="..\BotSharp.Abstraction\BotSharp.Abstraction.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Repository\Abstraction\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/BotSharp.Plugin.Mongo.csproj b/src/Plugins/BotSharp.Plugin.MongoStorage/BotSharp.Plugin.MongoStorage.csproj
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/BotSharp.Plugin.Mongo.csproj
rename to src/Plugins/BotSharp.Plugin.MongoStorage/BotSharp.Plugin.MongoStorage.csproj
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Collections/AgentCollection.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentCollection.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Collections/AgentCollection.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentCollection.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Collections/ConversationCollection.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/ConversationCollection.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Collections/ConversationCollection.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Collections/ConversationCollection.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Collections/UserAgentCollection.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserAgentCollection.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Collections/UserAgentCollection.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserAgentCollection.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Collections/UserCollection.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserCollection.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Collections/UserCollection.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserCollection.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/MongoBase.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoBase.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/MongoBase.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/MongoBase.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/MongoDbContext.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/MongoDbContext.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/MongoRepositoryPlugin.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoRepositoryPlugin.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/MongoRepositoryPlugin.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/MongoRepositoryPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Repository/MongoRepository.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Repository/MongoRepository.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoRepository/Using.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Using.cs
similarity index 100%
rename from src/Plugins/BotSharp.Plugin.MongoRepository/Using.cs
rename to src/Plugins/BotSharp.Plugin.MongoStorage/Using.cs
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
index 0cb02ead..292e3436 100644
--- a/src/WebStarter/WebStarter.csproj
+++ b/src/WebStarter/WebStarter.csproj
@@ -42,6 +42,7 @@
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.HuggingFace\BotSharp.Plugin.HuggingFace.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.LLamaSharp\BotSharp.Plugin.LLamaSharp.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.MetaAI\BotSharp.Plugin.MetaAI.csproj" />
+    <ProjectReference Include="..\Plugins\BotSharp.Plugin.MongoRepository\BotSharp.Plugin.MongoStorage.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.PaddleSharp\BotSharp.Plugin.PaddleSharp.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.Qdrant\BotSharp.Plugin.Qdrant.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.RoutingSpeeder\BotSharp.Plugin.RoutingSpeeder.csproj" />