SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

resove conflicts

Browse source
This commit is contained in:
Jicheng Lu 2023-09-09 11:29:08 -05:00
parent 56eb31dd1d
commit 5e9f910661
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
View file

@ -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>

2
src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs
View file

@ -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;

1
src/WebStarter/appsettings.json
View file

@ -98,6 +98,7 @@
"PluginLoader": {
"Assemblies": [
"BotSharp.Plugin.MongoStorage",
"BotSharp.Core",
"BotSharp.Plugin.AzureOpenAI",
"BotSharp.Plugin.MetaAI",