From fca3875484f409a0104e487c74de825aabcc0340 Mon Sep 17 00:00:00 2001
From: Devis Lucato <devis@microsoft.com>
Date: Thu, 8 Feb 2024 11:06:05 -0800
Subject: [PATCH] Upgrade KM packages + misc

Add setup.sh to docker image
---
 Directory.Packages.props                             |  6 +++---
 KernelMemory.sln                                     |  1 +
 .../002-dotnet-SemanticKernelPlugin.csproj           |  2 +-
 .../203-dotnet-using-core-nuget.csproj               |  2 +-
 .../206-dotnet-configuration-and-logging/Program.cs  |  3 ++-
 service/Service/Service.csproj                       | 12 ++++++------
 tools/docker/Dockerfile                              |  1 +
 tools/docker/content/setup.sh                        |  9 +++++++++
 8 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 tools/docker/content/setup.sh

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8ee046224..c07a747b3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,7 +38,7 @@
   <!-- Kernel Memory -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.KernelMemory.Abstractions" Version="0.27.240205.2" />
-    <PackageVersion Include="KernelMemory.MemoryStorage.SqlServer" Version="1.3.0" />
+    <PackageVersion Include="KernelMemory.MemoryStorage.SqlServer" Version="1.3.1" />
     <PackageVersion Include="FreeMindLabs.KernelMemory.Elasticsearch" Version="0.9.5" />
   </ItemGroup>
   <!-- Semantic Kernel -->
@@ -55,7 +55,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" />
     <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -67,7 +67,7 @@
   </ItemGroup>
   <!-- Tests -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Xunit.DependencyInjection" Version="8.9.1" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.1.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
diff --git a/KernelMemory.sln b/KernelMemory.sln
index 682950551..9fb0e7c2d 100644
--- a/KernelMemory.sln
+++ b/KernelMemory.sln
@@ -220,6 +220,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{D4C4BED2-B071-49AB-BAA6-DB4721C0BF26}"
 	ProjectSection(SolutionItems) = preProject
 		tools\docker\content\run.sh = tools\docker\content\run.sh
+		tools\docker\content\setup.sh = tools\docker\content\setup.sh
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAISearch.UnitTests", "extensions\AzureAISearch\AzureAISearch.UnitTests\AzureAISearch.UnitTests.csproj", "{9F564F2D-EADD-47DE-9293-92B3E9CFFE36}"
diff --git a/examples/002-dotnet-SemanticKernelPlugin/002-dotnet-SemanticKernelPlugin.csproj b/examples/002-dotnet-SemanticKernelPlugin/002-dotnet-SemanticKernelPlugin.csproj
index 6dbb7016c..23c091afc 100644
--- a/examples/002-dotnet-SemanticKernelPlugin/002-dotnet-SemanticKernelPlugin.csproj
+++ b/examples/002-dotnet-SemanticKernelPlugin/002-dotnet-SemanticKernelPlugin.csproj
@@ -13,7 +13,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.SemanticKernel" Version="1.3.0" />
-        <PackageReference Include="Microsoft.KernelMemory.SemanticKernelPlugin" Version="0.27.240205.2" />
+        <PackageReference Include="Microsoft.KernelMemory.SemanticKernelPlugin" Version="0.27.240207.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/examples/203-dotnet-using-core-nuget/203-dotnet-using-core-nuget.csproj b/examples/203-dotnet-using-core-nuget/203-dotnet-using-core-nuget.csproj
index 48073b2d8..3323cb0f2 100644
--- a/examples/203-dotnet-using-core-nuget/203-dotnet-using-core-nuget.csproj
+++ b/examples/203-dotnet-using-core-nuget/203-dotnet-using-core-nuget.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.27.240205.2" />
+        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.27.240207.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/examples/206-dotnet-configuration-and-logging/Program.cs b/examples/206-dotnet-configuration-and-logging/Program.cs
index 772ba2262..bf1bdc338 100644
--- a/examples/206-dotnet-configuration-and-logging/Program.cs
+++ b/examples/206-dotnet-configuration-and-logging/Program.cs
@@ -4,7 +4,8 @@
 
 public static class Program
 {
-    public static async Task Main(string[] args)
+    // ReSharper disable InconsistentNaming
+    public static async Task Main()
     {
         var openAIConfig = new OpenAIConfig
         {
diff --git a/service/Service/Service.csproj b/service/Service/Service.csproj
index 44f6367fd..c29aa1c8f 100644
--- a/service/Service/Service.csproj
+++ b/service/Service/Service.csproj
@@ -12,21 +12,21 @@
     <ItemGroup>
         <!-- Microsoft.KernelMemory.Core includes also extensions without external dependencies, e.g. all Azure extensions -->
 
-        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.27.240205.2" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
+        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.27.240207.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
         <ProjectReference Include="..\Core\Core.csproj" Condition="'$(SolutionName)' == 'KernelMemoryDev'"/>
 
         <!-- These extensions are used by ServiceConfiguration to support third party dependencies -->
 
-        <PackageReference Include="Microsoft.KernelMemory.AI.LlamaSharp" Version="0.27.240205.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
+        <PackageReference Include="Microsoft.KernelMemory.AI.LlamaSharp" Version="0.27.240207.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
         <ProjectReference Include="..\..\extensions\LlamaSharp\LlamaSharp\LlamaSharp.csproj" Condition="'$(SolutionName)' == 'KernelMemoryDev'"/>
 
-        <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="0.27.240205.2" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
+        <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Postgres" Version="0.27.240207.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
         <ProjectReference Include="..\..\extensions\Postgres\Postgres\Postgres.csproj" Condition="'$(SolutionName)' == 'KernelMemoryDev'"/>
 
-        <PackageReference Include="Microsoft.KernelMemory.Orchestration.RabbitMQ" Version="0.27.240205.2" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
+        <PackageReference Include="Microsoft.KernelMemory.Orchestration.RabbitMQ" Version="0.27.240207.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
         <ProjectReference Include="..\..\extensions\RabbitMQ\RabbitMQ.csproj" Condition="'$(SolutionName)' == 'KernelMemoryDev'"/>
 
-        <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Redis" Version="0.27.240205.2" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
+        <PackageReference Include="Microsoft.KernelMemory.MemoryDb.Redis" Version="0.27.240207.1" Condition="'$(SolutionName)' != 'KernelMemoryDev'" />
         <ProjectReference Include="..\..\extensions\Redis\Redis\Redis.csproj" Condition="'$(SolutionName)' == 'KernelMemoryDev'"/>
     </ItemGroup>
 
@@ -62,7 +62,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index fc343c6f6..5a2b1af10 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -18,6 +18,7 @@ WORKDIR /build/source/service/Service
 RUN \
     dotnet build --configuration Release --output /build/output && \
     cp ../../tools/docker/content/run.sh /build/output/ && \
+    cp ../../tools/docker/content/setup.sh /build/output/ && \
     chmod ugo=r /build/output/*.dll
 
 # Generate data used outside the image to label it
diff --git a/tools/docker/content/setup.sh b/tools/docker/content/setup.sh
new file mode 100644
index 000000000..b40b84b8e
--- /dev/null
+++ b/tools/docker/content/setup.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This script is copied into the Docker image and is used to start Kernel Memory service configuration wizard
+
+set -e
+
+cd /app/
+
+dotnet Microsoft.KernelMemory.ServiceAssembly.dll setup