Remove Packages with Questionable licenses. Update SEmantic Kernel due to security issues.

Author: n1xan

Bellatrix.LLM/Bellatrix.LLM.csproj

@@ -14,7 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-        <PackageReference Include="Microsoft.SemanticKernel" Version="1.68.0" />
+        <PackageReference Include="Microsoft.SemanticKernel" Version="1.70.0" />
         <!-- DO NOT update Microsoft.KernelMemory unless we move to .NET 9 -->
         <PackageReference Include="Microsoft.KernelMemory" Version="0.98.250508.3" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />

src/Bellatrix.Api/Bellatrix.API.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
+    <PackageReference Include="JsonSchema.Net" Version="9.1.0" />
 
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="Polly" Version="8.6.5" />

src/Bellatrix.Api/assertions/AssertExtensions.cs

@@ -17,10 +17,10 @@
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Text.Json;
 using System.Xml;
 using System.Xml.Schema;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
+using Json.Schema;
 using RestSharp;
 
 namespace Bellatrix.Api;
@@ -212,20 +212,17 @@ public static void AssertSchema(this MeasuredResponse response, Uri schemaUri)
             AssertXmlSchema(response, schemaUri);
         }
     }
-
     private static void AssertJsonSchema(MeasuredResponse response, string schemaContent)
     {
-        JSchema jsonSchema;
-
+        JsonSchema jsonSchema;
         try
         {
-            jsonSchema = JSchema.Parse(schemaContent);
+            jsonSchema = JsonSchema.FromText(schemaContent);
         }
         catch (Exception ex)
         {
             throw new ArgumentException("Schema is not valid schema", ex);
         }
-
         AssertJsonSchema(response, jsonSchema);
     }
 
@@ -237,26 +234,24 @@ private static void AssertJsonSchema(MeasuredResponse response, Uri schemaUri)
         AssertJsonSchema(response, schemaResponse.Content);
     }
 
-    private static void AssertJsonSchema(MeasuredResponse response, JSchema jsonSchema)
+    private static void AssertJsonSchema(MeasuredResponse response, JsonSchema jsonSchema)
     {
-        IList<string> messages;
-
-        var trimmedContent = response.Content.TrimStart();
-
-        bool isSchemaValid =
-            trimmedContent.StartsWith("{", StringComparison.Ordinal)
-                ? JObject.Parse(response.Content).IsValid(jsonSchema, out messages)
-                : JArray.Parse(response.Content).IsValid(jsonSchema, out messages);
-
-        if (!isSchemaValid)
+        var jsonDocument = JsonDocument.Parse(response.Content);
+        var result = jsonSchema.Evaluate(jsonDocument.RootElement);
+        if (!result.IsValid)
         {
             var sb = new StringBuilder();
             sb.AppendLine("JSON Schema is not valid. Error Messages:");
-            foreach (var errorMessage in messages)
+            foreach (var detail in result.Details)
             {
-                sb.AppendLine(errorMessage);
+                if (detail.Errors != null)
+                {
+                    foreach (var error in detail.Errors)
+                    {
+                        sb.AppendLine($"{detail.InstanceLocation}: {error.Value}");
+                    }
+                }
             }
-
             throw new ApiAssertException(sb.ToString());
         }
     }

src/Bellatrix.Playwright/Bellatrix.Playwright.csproj

@@ -7,7 +7,7 @@
 	<Import Project="..\..\shared\SharedAssemblyInfo.targets" />
 
 	<ItemGroup>
-    <PackageReference Include="AutoMapper" Version="16.0.0" />
+    <PackageReference Include="Mapster" Version="10.0.0-pre01" />
     <PackageReference Include="Microsoft.Playwright" Version="1.57.0" />
     <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.57.0" />
 	<PackageReference Include="MSTest" Version="4.0.2" />

src/Bellatrix.Playwright/services/CookiesService.cs

@@ -12,7 +12,7 @@
 // <author>Miriam Kyoseva</author>
 // <site>https://bellatrix.solutions/</site>
 
-using AutoMapper;
+using Mapster;
 using Bellatrix.Playwright.Services.Browser;
 using Bellatrix.Playwright.Services;
 
@@ -34,9 +34,7 @@ public void AddCookie(string cookieName, string cookieValue, string path = "/")
 
     public void AddCookie(System.Net.Cookie cookieToAdd)
     {
-        var config = ServicesCollection.Current.Resolve<MapperConfiguration>();
-        var mapper = config.CreateMapper();
-        Cookie cookie = mapper.Map<Cookie>(cookieToAdd);
+        Cookie cookie = cookieToAdd.Adapt<Cookie>();
 
         AddCookie(cookie);
     }
@@ -58,15 +56,11 @@ public void DeleteCookie(string cookieName)
 
         Cookie[] updatedCookies = new Cookie[cookies.Count];
 
-        var config = ServicesCollection.Current.Resolve<MapperConfiguration>();
-        var mapper = config.CreateMapper();
-
         for (int i = 0; i < updatedCookies.Length; i++)
         {
-            updatedCookies[i] = mapper.Map<Cookie>(cookies.ElementAt(i));
+            updatedCookies[i] = cookies.ElementAt(i).Adapt<Cookie>();
         }
 
-
         CurrentContext.AddCookies(updatedCookies);
     }
 

src/Bellatrix.Playwright/syncplaywright/getbyoptions/MapperService.cs

@@ -12,49 +12,45 @@
 // <author>Miriam Kyoseva</author>
 // <site>https://bellatrix.solutions/</site>
 
-using AutoMapper;
+using Mapster;
 
 namespace Bellatrix.Playwright.SyncPlaywright;
 
 internal static class MapperService
 {
-    private static MapperConfiguration Config;
-    private static IMapper Mapper;
+    private static readonly TypeAdapterConfig Config;
 
     static MapperService()
     {
-        Config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<GetByAltTextOptions, LocatorGetByAltTextOptions>();
-            cfg.CreateMap<GetByAltTextOptions, FrameLocatorGetByAltTextOptions>();
-            cfg.CreateMap<GetByAltTextOptions, PageGetByAltTextOptions>();
-
-            cfg.CreateMap<GetByLabelOptions, LocatorGetByLabelOptions>();
-            cfg.CreateMap<GetByLabelOptions, FrameLocatorGetByLabelOptions>();
-            cfg.CreateMap<GetByLabelOptions, PageGetByLabelOptions>();
-
-            cfg.CreateMap<GetByPlaceholderOptions, LocatorGetByPlaceholderOptions>();
-            cfg.CreateMap<GetByPlaceholderOptions, FrameLocatorGetByPlaceholderOptions>();
-            cfg.CreateMap<GetByPlaceholderOptions, PageGetByPlaceholderOptions>();
-
-            cfg.CreateMap<GetByRoleOptions, LocatorGetByRoleOptions>();
-            cfg.CreateMap<GetByRoleOptions, FrameLocatorGetByRoleOptions>();
-            cfg.CreateMap<GetByRoleOptions, PageGetByRoleOptions>();
-
-            cfg.CreateMap<GetByTextOptions, LocatorGetByTextOptions>();
-            cfg.CreateMap<GetByTextOptions, FrameLocatorGetByTextOptions>();
-            cfg.CreateMap<GetByTextOptions, PageGetByTextOptions>();
-
-            cfg.CreateMap<GetByTitleOptions, LocatorGetByTitleOptions>();
-            cfg.CreateMap<GetByTitleOptions, FrameLocatorGetByTitleOptions>();
-            cfg.CreateMap<GetByTitleOptions, PageGetByTitleOptions>();
-        }, null);
-
-        Mapper = Config.CreateMapper();
+        Config = new TypeAdapterConfig();
+
+        Config.NewConfig<GetByAltTextOptions, LocatorGetByAltTextOptions>();
+        Config.NewConfig<GetByAltTextOptions, FrameLocatorGetByAltTextOptions>();
+        Config.NewConfig<GetByAltTextOptions, PageGetByAltTextOptions>();
+
+        Config.NewConfig<GetByLabelOptions, LocatorGetByLabelOptions>();
+        Config.NewConfig<GetByLabelOptions, FrameLocatorGetByLabelOptions>();
+        Config.NewConfig<GetByLabelOptions, PageGetByLabelOptions>();
+
+        Config.NewConfig<GetByPlaceholderOptions, LocatorGetByPlaceholderOptions>();
+        Config.NewConfig<GetByPlaceholderOptions, FrameLocatorGetByPlaceholderOptions>();
+        Config.NewConfig<GetByPlaceholderOptions, PageGetByPlaceholderOptions>();
+
+        Config.NewConfig<GetByRoleOptions, LocatorGetByRoleOptions>();
+        Config.NewConfig<GetByRoleOptions, FrameLocatorGetByRoleOptions>();
+        Config.NewConfig<GetByRoleOptions, PageGetByRoleOptions>();
+
+        Config.NewConfig<GetByTextOptions, LocatorGetByTextOptions>();
+        Config.NewConfig<GetByTextOptions, FrameLocatorGetByTextOptions>();
+        Config.NewConfig<GetByTextOptions, PageGetByTextOptions>();
+
+        Config.NewConfig<GetByTitleOptions, LocatorGetByTitleOptions>();
+        Config.NewConfig<GetByTitleOptions, FrameLocatorGetByTitleOptions>();
+        Config.NewConfig<GetByTitleOptions, PageGetByTitleOptions>();
     }
 
     public static T ConvertTo<T>(this IOptions options)
     {
-        return Mapper.Map<T>(options);
+        return options.Adapt<T>(Config);
     }
 }