Dependencies upgrade (#953)

microsoft · Dec 19, 2024 · 385d8c4 · 385d8c4
1 parent c0b4e60
commit 385d8c4
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 40 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,65 +3,65 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.405.7" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.410.8" />
     <PackageVersion Include="Azure.AI.ContentSafety" Version="1.0.0" />
     <PackageVersion Include="Azure.AI.FormRecognizer" Version="4.1.0" />
     <PackageVersion Include="Azure.Identity" Version="1.13.1" />
     <PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
-    <PackageVersion Include="Azure.Storage.Queues" Version="12.20.1" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
+    <PackageVersion Include="Azure.Storage.Queues" Version="12.21.0" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.12.1" />
-    <PackageVersion Include="DocumentFormat.OpenXml" Version="3.1.1" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.70" />
+    <PackageVersion Include="DocumentFormat.OpenXml" Version="3.2.0" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.71" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.5.2" />
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI.Cuda" Version="0.5.2" />
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI.DirectML" Version="0.5.2" />
     <PackageVersion Include="MongoDB.Driver.GridFS" Version="2.30.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="OllamaSharp" Version="4.0.3" />
+    <PackageVersion Include="OllamaSharp" Version="4.0.11" />
     <PackageVersion Include="PdfPig" Version="0.1.9" />
-    <PackageVersion Include="Polly.Core" Version="8.4.2" />
+    <PackageVersion Include="Polly.Core" Version="8.5.0" />
     <PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageVersion Include="ReadLine" Version="2.0.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Memory.Data" Version="8.0.1" />
-    <PackageVersion Include="System.Numerics.Tensors" Version="8.0.0" />
+    <PackageVersion Include="System.Memory.Data" Version="9.0.0" />
+    <PackageVersion Include="System.Numerics.Tensors" Version="9.0.0" />
     <!-- Tokenizers Data Packages -->
     <PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="1.0.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers.Data.P50kBase" Version="1.0.0" />
   </ItemGroup>
   <!-- Security upgrades -->
   <ItemGroup>
-    <PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
   </ItemGroup>
   <!-- Missing Strong Name (CS8002) -->
   <ItemGroup>
     <PackageVersion Include="ClosedXML" Version="0.104.2" />
-    <PackageVersion Include="LLamaSharp" Version="0.18.0" />
-    <PackageVersion Include="LLamaSharp.Backend.Cpu" Version="0.18.0" />
+    <PackageVersion Include="LLamaSharp" Version="0.19.0" />
+    <PackageVersion Include="LLamaSharp.Backend.Cpu" Version="0.19.0" />
     <PackageVersion Include="Pgvector" Version="0.3.0" />
-    <PackageVersion Include="NRedisStack" Version="0.13.0" />
+    <PackageVersion Include="NRedisStack" Version="0.13.1" />
   </ItemGroup>
   <!-- Semantic Kernel -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.26.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.26.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.26.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.26.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.32.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.32.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.32.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.32.0" />
   </ItemGroup>
   <!-- Documentation -->
   <ItemGroup>
@@ -73,7 +73,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0">
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
@@ -85,11 +85,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
@@ -100,15 +100,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <PackageVersion Include="xunit.extensibility.core" Version="2.7.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Xunit.DependencyInjection" Version="9.6.0" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="9.7.0" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
   </ItemGroup>
   <!-- Aspire -->

diff --git a/KernelMemory.sln b/KernelMemory.sln
@@ -94,11 +94,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B897
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{48E79819-1E9E-4075-90DA-BAEC761C89B2}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\docker-build-push.yml = .github\workflows\docker-build-push.yml
 		.github\workflows\dotnet-build.yml = .github\workflows\dotnet-build.yml
 		.github\workflows\dotnet-unit-tests.yml = .github\workflows\dotnet-unit-tests.yml
 		.github\workflows\github-pages-jekyll.yml = .github\workflows\github-pages-jekyll.yml
 		.github\workflows\spell-check-with-typos.yml = .github\workflows\spell-check-with-typos.yml
+		.github\workflows\docker-amd64.yml = .github\workflows\docker-amd64.yml
+		.github\workflows\docker-armd64.yml = .github\workflows\docker-armd64.yml
+		.github\workflows\fortify.yml = .github\workflows\fortify.yml
+		.github\workflows\securitycodescan.yml = .github\workflows\securitycodescan.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "service", "service", "{87DEAE8D-138C-4FDD-B4C9-11C3A7817E8F}"

diff --git a/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj b/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj
@@ -13,6 +13,15 @@
         <PackageReference Include="System.Memory.Data" />
     </ItemGroup>
 
+    <ItemGroup>
+        <!-- If you plan on using LLamaSharp, you will need to enable one of these backends,
+             which depend on the hardware hosting Kernel Memory code. -->
+
+        <!-- <PackageReference Include="LLamaSharp.Backend.Cpu" />      -->
+        <!-- <PackageReference Include="LLamaSharp.Backend.Cuda11" />   -->
+        <!-- <PackageReference Include="LLamaSharp.Backend.Cuda12" />   -->
+    </ItemGroup>
+
     <ItemGroup>
         <None Remove="file1-Wikipedia-Carbon.txt" />
         <Content Include="file1-Wikipedia-Carbon.txt">

diff --git a/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj b/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.90.241021.1" />
+        <PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.95.241216.2" />
     </ItemGroup>
 
 </Project>
diff --git a/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs b/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs
@@ -27,7 +27,7 @@
 wepApp.MapControllers();
 
 // Optional: add Kernel Memory web endpoints
-wepApp.AddGetIndexesEndpoint("/km/"); // GET /km/indexes
+wepApp.AddListIndexesEndpoint("/km/"); // GET /km/indexes
 
 // Start ASP.NET app
 wepApp.Run();

diff --git a/examples/301-discord-test-application/301-discord-test-application.csproj b/examples/301-discord-test-application/301-discord-test-application.csproj
@@ -11,9 +11,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.2.2" />
+        <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
         <PackageReference Include="Discord.Net" Version="3.16.0" />
-        <PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.90.241021.1" />
+        <PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.95.241216.2" />
     </ItemGroup>
 
 </Project>
diff --git a/examples/301-discord-test-application/DiscordMessageHandler.cs b/examples/301-discord-test-application/DiscordMessageHandler.cs
@@ -49,7 +49,7 @@ public DiscordMessageHandler(
         this._firstInvokeDb = serviceProvider.GetService<DiscordDbContext>() ?? throw new ConfigurationException("Discord DB Content is not defined");
     }
 
-    public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default)
+    public async Task<(ReturnType returnType, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default)
     {
         this.OnFirstInvoke();
 
@@ -75,13 +75,13 @@ public DiscordMessageHandler(
                     if (data == null)
                     {
                         this._log.LogError("Failed to deserialize Discord data file, result is NULL");
-                        return (true, pipeline);
+                        return (ReturnType.FatalError, pipeline);
                     }
                 }
                 catch (Exception e)
                 {
                     this._log.LogError(e, "Failed to deserialize Discord data file");
-                    return (true, pipeline);
+                    return (ReturnType.FatalError, pipeline);
                 }
 
                 await db.Messages.AddAsync(data, cancellationToken).ConfigureAwait(false);
@@ -90,7 +90,7 @@ public DiscordMessageHandler(
             await db.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        return (true, pipeline);
+        return (ReturnType.Success, pipeline);
     }
 
     public void Dispose()

diff --git a/service/tests/Abstractions.UnitTests/Http/SSETest.cs b/service/tests/Abstractions.UnitTests/Http/SSETest.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.KM.Abstractions.UnitTests.Http;
 
+[Trait("Category", "UnitTest")]
 public class SSETest
 {
     [Theory]

diff --git a/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs b/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.KM.Core.UnitTests.Configuration;
 
+[Trait("Category", "UnitTest")]
 public class ConfigEnvVarsTest : BaseUnitTestCase
 {
     public ConfigEnvVarsTest(ITestOutputHelper output) : base(output)