sillsdev · myieye · May 12, 2026 · May 12, 2026 · May 13, 2026 · May 13, 2026
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "9.0.6",
+      "version": "10.0.7",
       "commands": [
         "dotnet-ef"
       ],

diff --git a/.github/workflows/fw-lite.yaml b/.github/workflows/fw-lite.yaml
@@ -27,7 +27,10 @@ env:
 jobs:
   build-and-test:
     name: Build FW Lite and run tests
-    timeout-minutes: 40
+    #bumped from 40 -> 60: with the .NET 10 / Linq2Db v6 upgrade many tests that
+    #used to fast-fail now run to completion (passing), so total test step time
+    #went up. Hits Windows-CI variance; 60 leaves some headroom.
+    timeout-minutes: 60
     runs-on: windows-latest
     outputs:
       version: ${{ steps.setVersion.outputs.VERSION }}

diff --git a/backend/Directory.Packages.props b/backend/Directory.Packages.props
diff --git a/backend/FwHeadless/FwHeadless.csproj b/backend/FwHeadless/FwHeadless.csproj
@@ -11,7 +11,6 @@
     <PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" />
     <PackageReference Include="SIL.Chorus.Mercurial" />
     <PackageReference Include="SIL.Chorus.ChorusMerge" GeneratePathProperty="true" />
-    <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../harmony/src/SIL.Harmony/SIL.Harmony.csproj" />

diff --git a/backend/FwHeadless/Program.cs b/backend/FwHeadless/Program.cs
@@ -45,7 +45,6 @@
         {
             //never emit traces for sqlite as there's way too much noise and it'll crash servers and overrun honeycomb
             c.Filter = (provider, command) => provider is not "Microsoft.EntityFrameworkCore.Sqlite";
-            c.SetDbStatementForText = true;
         })
         .AddSource(FwHeadlessActivitySource.ActivitySourceName,
             FwLiteProjectSyncActivitySource.ActivitySourceName,

diff --git a/backend/FwHeadless/Routes/MediaFileRoutes.cs b/backend/FwHeadless/Routes/MediaFileRoutes.cs
@@ -7,7 +7,7 @@ public static class MediaFileRoutes
     public const string RootRoute = "/api/media";
     public static IEndpointConventionBuilder MapMediaFileRoutes(this WebApplication app)
     {
-        var group = app.MapGroup(RootRoute).WithOpenApi();
+        var group = app.MapGroup(RootRoute);
         group.MapGet("/list/{projectId:guid}", MediaFileController.ListFiles);
         group.MapGet("/metadata/{fileId:guid}", MediaFileMetadataController.GetFileMetadata);
         group.MapGet("/{fileId:guid}", MediaFileController.GetFile);

diff --git a/backend/FwHeadless/Routes/MergeRoutes.cs b/backend/FwHeadless/Routes/MergeRoutes.cs
@@ -18,7 +18,7 @@ public static class MergeRoutes
 {
     public static IEndpointConventionBuilder MapMergeRoutes(this WebApplication app)
     {
-        var group = app.MapGroup("/api/merge").WithOpenApi();
+        var group = app.MapGroup("/api/merge");
 
         group.MapPost("/execute", ExecuteMergeRequest);
         group.MapPost("/sync-harmony", SyncHarmonyProject);

diff --git a/backend/FwLite/FwLiteShared/Auth/AuthService.cs b/backend/FwLite/FwLiteShared/Auth/AuthService.cs
@@ -10,7 +10,7 @@ public class AuthService(LexboxProjectService lexboxProjectService, OAuthClientF
     [JSInvokable]
     public async Task<ServerStatus[]> Servers()
     {
-        return await lexboxProjectService.Servers().ToAsyncEnumerable().SelectAwait(async s =>
+        return await lexboxProjectService.Servers().ToAsyncEnumerable().Select(async (LexboxServer s, CancellationToken _) =>
         {
             var currentName = await clientFactory.GetClient(s).GetCurrentName();
             return new ServerStatus(s.DisplayName,

diff --git a/backend/FwLite/FwLiteWeb/Routes/ActivityRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/ActivityRoutes.cs
@@ -1,22 +1,22 @@
 using LcmCrdt;
 using FwLiteWeb.Hubs;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace FwLiteWeb.Routes;
 
 public static class ActivityRoutes
 {
     public static IEndpointConventionBuilder MapActivities(this WebApplication app)
     {
-        var group = app.MapGroup("/api/activity/{project}").WithOpenApi(operation =>
+        var group = app.MapGroup("/api/activity/{project}").AddOpenApiOperationTransformer((operation, _, _) =>
         {
-            operation.Parameters.Add(new OpenApiParameter()
+            operation.Parameters?.Add(new OpenApiParameter()
             {
                 Name = CrdtMiniLcmApiHub.ProjectRouteKey,
                 In = ParameterLocation.Path,
                 Required = true
             });
-            return operation;
+            return Task.CompletedTask;
         });
         group.MapGet("/", (HistoryService historyService, int skip, int take) => historyService.ProjectActivity(skip, take));
         return group;

diff --git a/backend/FwLite/FwLiteWeb/Routes/AuthRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/AuthRoutes.cs
@@ -12,7 +12,7 @@ public static class AuthRoutes
     public record ServerStatus(string DisplayName, bool LoggedIn, string? LoggedInAs, string? Authority);
     public static IEndpointConventionBuilder MapAuthRoutes(this WebApplication app)
     {
-        var group = app.MapGroup("/api/auth").WithOpenApi();
+        var group = app.MapGroup("/api/auth");
         group.MapGet("/servers", (AuthService authService) => authService.Servers());
         group.MapGet("/login/{authority}",
             async (AuthService authService, string authority, IOptions<AuthConfig> options, [FromHeader] string referer) =>

diff --git a/backend/FwLite/FwLiteWeb/Routes/FwIntegrationRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/FwIntegrationRoutes.cs
@@ -3,22 +3,22 @@
 using FwLiteWeb.Hubs;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace FwLiteWeb.Routes;
 
 public static class FwIntegrationRoutes
 {
     public static IEndpointConventionBuilder MapFwIntegrationRoutes(this WebApplication app)
     {
-        var group = app.MapGroup($"/api/fw/{{{FwDataMiniLcmHub.ProjectRouteKey}}}").WithOpenApi(
-            operation =>
+        var group = app.MapGroup($"/api/fw/{{{FwDataMiniLcmHub.ProjectRouteKey}}}").AddOpenApiOperationTransformer(
+            (operation, _, _) =>
             {
-                operation.Parameters.Add(new OpenApiParameter()
+                operation.Parameters?.Add(new OpenApiParameter()
                 {
                     Name = FwDataMiniLcmHub.ProjectRouteKey, In = ParameterLocation.Path, Required = true
                 });
-                return operation;
+                return Task.CompletedTask;
             });
         group.MapGet("/link/entry/{id}",
             async ([FromServices] FwDataProjectContext context,

diff --git a/backend/FwLite/FwLiteWeb/Routes/HistoryRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/HistoryRoutes.cs
@@ -7,7 +7,7 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using FwLiteWeb.Hubs;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using MiniLcm.Models;
 
 namespace FwLiteWeb.Routes;
@@ -16,13 +16,13 @@ public static class HistoryRoutes
 {
     public static IEndpointConventionBuilder MapHistoryRoutes(this WebApplication app)
     {
-        var group = app.MapGroup("/api/history/{project}").WithOpenApi(operation =>
+        var group = app.MapGroup("/api/history/{project}").AddOpenApiOperationTransformer((operation, _, _) =>
         {
-            operation.Parameters.Add(new OpenApiParameter()
+            operation.Parameters?.Add(new OpenApiParameter()
             {
                 Name = CrdtMiniLcmApiHub.ProjectRouteKey, In = ParameterLocation.Path, Required = true
             });
-            return operation;
+            return Task.CompletedTask;
         });
         group.MapGet("/snapshot/{snapshotId:guid}",
             async (Guid snapshotId, HistoryService historyService) => await historyService.GetSnapshot(snapshotId));

diff --git a/backend/FwLite/FwLiteWeb/Routes/ImportRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/ImportRoutes.cs
@@ -1,7 +1,7 @@
  using FwLiteShared.Projects;
  using SIL.Harmony.Db;
  using FwLiteWeb.Services;
- using Microsoft.OpenApi.Models;
+ using Microsoft.OpenApi;
 using MiniLcm;
 
 namespace FwLiteWeb.Routes;

diff --git a/backend/FwLite/FwLiteWeb/Routes/MiniLcmRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/MiniLcmRoutes.cs
@@ -1,13 +1,13 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using MiniLcm;
 using MiniLcm.Filtering;
 using MiniLcm.Models;
 using MiniLcm.Project;
 using MiniLcm.Validators;
+using System.Text.Json.Nodes;
 
 namespace FwLiteWeb.Routes;
 
@@ -31,9 +31,9 @@ internal IMiniLcmApi MiniLcmApi
     public static IEndpointConventionBuilder MapMiniLcmRoutes(this IEndpointRouteBuilder app, [StringSyntax("route")] string prefix)
     {
         var api = app.MapGroup(prefix + "/{projectType}/{projectCode}")
-            .WithOpenApi(operation =>
+            .AddOpenApiOperationTransformer((operation, _, _) =>
             {
-                operation.Parameters.Add(new()
+                operation.Parameters?.Add(new OpenApiParameter()
                 {
                     Name = "projectType",
                     In = ParameterLocation.Path,
@@ -42,19 +42,19 @@ public static IEndpointConventionBuilder MapMiniLcmRoutes(this IEndpointRouteBui
                     {
                         Enum =
                         [
-                            new OpenApiString(ProjectDataFormat.FwData.ToString()),
-                            new OpenApiString(ProjectDataFormat.Harmony.ToString())
+                            JsonValue.Create(ProjectDataFormat.FwData.ToString()),
+                            JsonValue.Create(ProjectDataFormat.Harmony.ToString())
                         ],
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     },
                 });
-                operation.Parameters.Add(new()
+                operation.Parameters?.Add(new OpenApiParameter()
                 {
                     Name = "projectCode",
                     In = ParameterLocation.Path,
                     Required = true
                 });
-                return operation;
+                return Task.CompletedTask;
             })
             .AddEndpointFilter(async (context, next) =>
             {

diff --git a/backend/FwLite/FwLiteWeb/Routes/ProjectRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/ProjectRoutes.cs
@@ -18,7 +18,7 @@ public static class ProjectRoutes
 {
     public static IEndpointConventionBuilder MapProjectRoutes(this WebApplication app)
     {
-        var group = app.MapGroup("/api").WithOpenApi();
+        var group = app.MapGroup("/api");
         group.MapGet("/remoteProjects",
             async (CombinedProjectsService combinedProjectsService) =>
             {

diff --git a/backend/FwLite/FwLiteWeb/Routes/TestRoutes.cs b/backend/FwLite/FwLiteWeb/Routes/TestRoutes.cs
@@ -3,7 +3,7 @@
 using LcmCrdt;
 using FwLiteWeb.Hubs;
 using FwLiteWeb.Services;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using MiniLcm;
 using MiniLcm.Models;
 
@@ -13,15 +13,15 @@ public static class TestRoutes
 {
     public static IEndpointConventionBuilder MapTest(this WebApplication app)
     {
-        var group = app.MapGroup("/api/test/{project}").WithOpenApi(operation =>
+        var group = app.MapGroup("/api/test/{project}").AddOpenApiOperationTransformer((operation, _, _) =>
         {
-            operation.Parameters.Add(new OpenApiParameter()
+            operation.Parameters?.Add(new OpenApiParameter()
             {
                 Name = CrdtMiniLcmApiHub.ProjectRouteKey,
                 In = ParameterLocation.Path,
                 Required = true
             });
-            return operation;
+            return Task.CompletedTask;
         });
         group.MapGet("/entries",
             (IMiniLcmApi api) =>