Skip to content

Commit b1ab821

Browse files
authored
Bump pretty much ALL packages for .NET 10 (#2264)
1 parent 84ba695 commit b1ab821

40 files changed

Lines changed: 1685 additions & 175 deletions

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "9.0.6",
6+
"version": "9.0.16",
77
"commands": [
88
"dotnet-ef"
99
],

.github/workflows/fw-lite.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,12 @@ jobs:
331331
- name: Publish Windows MAUI msix app
332332
working-directory: backend/FwLite/FwLiteMaui
333333
run: |
334-
dotnet publish -f net10.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
334+
# AppxPackageDir is the MSIX-targets equivalent of --artifacts-path: without it
335+
# MAUI 10 writes AppPackages to $(MSBuildProjectDirectory)/AppPackages, ignoring
336+
# --artifacts-path. Redirect it under artifacts/ so everything lives in one tree.
337+
dotnet publish -f net10.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:AppxPackageDir=../artifacts/AppPackages/ -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
335338
mkdir -p ../artifacts/msix
336-
cp ../artifacts/bin/FwLiteMaui/*/AppPackages/*/*.msix ../artifacts/msix/
339+
cp ../artifacts/AppPackages/*/*.msix ../artifacts/msix/
337340
338341
- name: Bundle MSIX
339342
working-directory: backend/FwLite/artifacts/msix

backend/Directory.Packages.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

backend/FwHeadless/FwHeadless.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" />
1212
<PackageReference Include="SIL.Chorus.Mercurial" />
1313
<PackageReference Include="SIL.Chorus.ChorusMerge" GeneratePathProperty="true" />
14-
<PackageReference Include="System.Security.Cryptography.Xml" />
1514
</ItemGroup>
1615
<ItemGroup>
1716
<ProjectReference Include="../harmony/src/SIL.Harmony/SIL.Harmony.csproj" />

backend/FwHeadless/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
{
4646
//never emit traces for sqlite as there's way too much noise and it'll crash servers and overrun honeycomb
4747
c.Filter = (provider, command) => provider is not "Microsoft.EntityFrameworkCore.Sqlite";
48-
c.SetDbStatementForText = true;
4948
})
5049
.AddSource(FwHeadlessActivitySource.ActivitySourceName,
5150
FwLiteProjectSyncActivitySource.ActivitySourceName,

backend/FwHeadless/Routes/MediaFileRoutes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static class MediaFileRoutes
77
public const string RootRoute = "/api/media";
88
public static IEndpointConventionBuilder MapMediaFileRoutes(this WebApplication app)
99
{
10-
var group = app.MapGroup(RootRoute).WithOpenApi();
10+
var group = app.MapGroup(RootRoute);
1111
group.MapGet("/list/{projectId:guid}", MediaFileController.ListFiles);
1212
group.MapGet("/metadata/{fileId:guid}", MediaFileMetadataController.GetFileMetadata);
1313
group.MapGet("/{fileId:guid}", MediaFileController.GetFile);

backend/FwHeadless/Routes/MergeRoutes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static class MergeRoutes
1818
{
1919
public static IEndpointConventionBuilder MapMergeRoutes(this WebApplication app)
2020
{
21-
var group = app.MapGroup("/api/merge").WithOpenApi();
21+
var group = app.MapGroup("/api/merge");
2222

2323
group.MapPost("/execute", ExecuteMergeRequest);
2424
group.MapPost("/sync-harmony", SyncHarmonyProject);

backend/FwLite/FwLiteShared/Auth/AuthService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class AuthService(LexboxProjectService lexboxProjectService, OAuthClientF
1010
[JSInvokable]
1111
public async Task<ServerStatus[]> Servers()
1212
{
13-
return await lexboxProjectService.Servers().ToAsyncEnumerable().SelectAwait(async s =>
13+
return await lexboxProjectService.Servers().ToAsyncEnumerable().Select(async (LexboxServer s, CancellationToken _) =>
1414
{
1515
var currentName = await clientFactory.GetClient(s).GetCurrentName();
1616
return new ServerStatus(s.DisplayName,

backend/FwLite/FwLiteWeb/Routes/ActivityRoutes.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
using LcmCrdt;
22
using FwLiteWeb.Hubs;
3-
using Microsoft.OpenApi.Models;
3+
using Microsoft.OpenApi;
44

55
namespace FwLiteWeb.Routes;
66

77
public static class ActivityRoutes
88
{
99
public static IEndpointConventionBuilder MapActivities(this WebApplication app)
1010
{
11-
var group = app.MapGroup("/api/activity/{project}").WithOpenApi(operation =>
11+
var group = app.MapGroup("/api/activity/{project}").AddOpenApiOperationTransformer((operation, _, _) =>
1212
{
13-
operation.Parameters.Add(new OpenApiParameter()
13+
operation.Parameters?.Add(new OpenApiParameter()
1414
{
1515
Name = CrdtMiniLcmApiHub.ProjectRouteKey,
1616
In = ParameterLocation.Path,
1717
Required = true
1818
});
19-
return operation;
19+
return Task.CompletedTask;
2020
});
2121
group.MapGet("/", (HistoryService historyService, int skip, int take) => historyService.ProjectActivity(skip, take));
2222
return group;

backend/FwLite/FwLiteWeb/Routes/AuthRoutes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static class AuthRoutes
1212
public record ServerStatus(string DisplayName, bool LoggedIn, string? LoggedInAs, string? Authority);
1313
public static IEndpointConventionBuilder MapAuthRoutes(this WebApplication app)
1414
{
15-
var group = app.MapGroup("/api/auth").WithOpenApi();
15+
var group = app.MapGroup("/api/auth");
1616
group.MapGet("/servers", (AuthService authService) => authService.Servers());
1717
group.MapGet("/login/{authority}",
1818
async (AuthService authService, string authority, IOptions<AuthConfig> options, [FromHeader] string referer) =>

0 commit comments

Comments
 (0)