From a80ecd9bb4740e59daedb3a12c083101e6164b09 Mon Sep 17 00:00:00 2001
From: Haiping Chen <haiping008@gmail.com>
Date: Mon, 17 Mar 2025 20:30:15 -0500
Subject: [PATCH] Fix PizzaBot compile issue.

---
 Directory.Packages.props                              |  9 +++++----
 src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj | 11 +++++++++++
 .../BotSharp.Core/build/BotSharp.Core.targets         | 10 ++++++++++
 src/WebStarter/WebStarter.csproj                      |  1 +
 .../BotSharp.Plugin.PizzaBot.csproj                   | 10 +++++-----
 5 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 src/Infrastructure/BotSharp.Core/build/BotSharp.Core.targets

diff --git a/Directory.Packages.props b/Directory.Packages.props
index aa76cf61..f49939eb 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <MSExtensionsVersion>8.0.0</MSExtensionsVersion>
-	  <AspNetCoreVersion>2.3.0</AspNetCoreVersion>
+    <AspNetCoreVersion>2.3.0</AspNetCoreVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
@@ -13,7 +13,7 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
@@ -51,7 +51,7 @@
     <PackageVersion Include="PdfPig" Version="0.1.8" />
     <PackageVersion Include="TensorFlow.Keras" Version="0.15.0" />
     <PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.15.3-dev.58" />
-    <PackageVersion Include="LLamaSharp" Version="0.20.0" />
+    <PackageVersion Include="LLamaSharp" Version="0.21.0" />
     <PackageVersion Include="FaissMask" Version="0.2.0" />
     <PackageVersion Include="FastText.NetWrapper" Version="1.3.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
@@ -108,7 +108,9 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
+    <PackageVersion Include="BotSharp.Core" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Logger" Version="$(BotSharpVersion)" />
+    <PackageVersion Include="BotSharp.Core.Realtime" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.OpenAPI" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Plugin.Dashboard" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Plugin.AzureOpenAI" Version="$(BotSharpVersion)" />
@@ -127,7 +129,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.5" />
   </ItemGroup>
-  
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.27" />
     <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="6.0.15" />
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
index 00e1f30a..687387a7 100644
--- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
+++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -46,18 +46,22 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="build\**" />
     <Compile Remove="packages\**" />
     <Compile Remove="Planning\**" />
     <Compile Remove="Translation\Models\**" />
+    <EmbeddedResource Remove="build\**" />
     <EmbeddedResource Remove="packages\**" />
     <EmbeddedResource Remove="Planning\**" />
     <EmbeddedResource Remove="Translation\Models\**" />
+    <None Remove="build\**" />
     <None Remove="packages\**" />
     <None Remove="Planning\**" />
     <None Remove="Translation\Models\**" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Content.targets" />
     <None Remove="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\templates\database_knowledge.liquid" />
     <None Remove="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\templates\reasoner.hf.liquid" />
     <None Remove="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\templates\reasoner.naive.liquid" />
@@ -213,4 +217,11 @@
     <ProjectReference Include="..\BotSharp.Abstraction\BotSharp.Abstraction.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="build\BotSharp.Core.targets" PackagePath="build\BotSharp.Core.targets" />
+    <Content Include="data/*.*">
+      <Pack>true</Pack>
+    </Content>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Infrastructure/BotSharp.Core/build/BotSharp.Core.targets b/src/Infrastructure/BotSharp.Core/build/BotSharp.Core.targets
new file mode 100644
index 00000000..ffb6c063
--- /dev/null
+++ b/src/Infrastructure/BotSharp.Core/build/BotSharp.Core.targets
@@ -0,0 +1,10 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <!-- Define the files to be copied -->
+    <ContentFiles Include="$(MSBuildThisFileDirectory)..\contentFiles\any\**\*.*" />
+  </ItemGroup>
+  <Target Name="CopyContentFiles" AfterTargets="Build">
+    <!-- Copy the content files to the output directory -->
+    <Copy SourceFiles="@(ContentFiles)" DestinationFolder="$(TargetDir)%(RecursiveDir)" />
+  </Target>
+</Project>
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
index 78c4537c..7817e167 100644
--- a/src/WebStarter/WebStarter.csproj
+++ b/src/WebStarter/WebStarter.csproj
@@ -11,6 +11,7 @@
   <ItemGroup Condition="$(SolutionName)==PizzaBot">
     <PackageReference Include="BotSharp.Logger" />
     <PackageReference Include="BotSharp.OpenAPI" />
+    <PackageReference Include="BotSharp.Core.Realtime" />
     <PackageReference Include="BotSharp.Plugin.Dashboard" />
     <PackageReference Include="BotSharp.Plugin.AzureOpenAI" />
     <PackageReference Include="BotSharp.Plugin.GoogleAI" />
diff --git a/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj b/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj
index 716f1f4d..91812c25 100644
--- a/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj
+++ b/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj
@@ -10,7 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="$(SolutionName)==PizzaBot">
-    <PackageReference Include="BotSharp.Core" Version="$(BotSharpVersion)" />
+    <PackageReference Include="BotSharp.Core" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(SolutionName)==BotSharp">
+    <ProjectReference Include="..\..\src\Infrastructure\BotSharp.Core\BotSharp.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -97,8 +101,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="$(SolutionName)==BotSharp">
-    <ProjectReference Include="..\..\src\Infrastructure\BotSharp.Core\BotSharp.Core.csproj" />
-  </ItemGroup>
-
 </Project>