Skip to content

update dependnecies april #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

update dependnecies april #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b17395
update to ef 9.0.4
hahn-kev Apr 18, 2025
9c79545
update ef tool to version 9.0.4 and update EF Projectables too
hahn-kev Apr 18, 2025
916e078
move AddQuartz into LexBoxDbContext.cs to ensure it's always run and …
hahn-kev Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "9.0.0",
"version": "9.0.4",
"commands": [
"dotnet-ef"
],
Expand Down
57 changes: 29 additions & 28 deletions backend/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="CrystalQuartz.AspNetCore" Version="7.2.0-beta" />
<PackageVersion Include="DataAnnotatedModelValidations" Version="6.0.0" />
<PackageVersion Include="EntityFrameworkCore.Projectables" Version="3.0.4" />
<PackageVersion Include="EntityFrameworkCore.Projectables.Abstractions" Version="4.0.0-preview.4" />
<PackageVersion Include="EntityFrameworkCore.Projectables" Version="4.0.0" />
<PackageVersion Include="EntityFrameworkCore.Projectables.Abstractions" Version="4.0.0" />
<PackageVersion Include="FluentAssertions" Version="7.0.0-alpha.5" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="Gridify" Version="2.16.2" />
<PackageVersion Include="Gridify.EntityFramework" Version="2.15.0" />
<PackageVersion Include="Gridify" Version="2.16.3" />
<PackageVersion Include="Gridify.EntityFramework" Version="2.16.3" />
<PackageVersion Include="HotChocolate.Analyzers" Version="13.9.14" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="14.0.0" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="14.0.0" />
Expand All @@ -28,7 +28,7 @@
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="icu.net" Version="3.0.0-beta.297" />
<PackageVersion Include="linq2db.AspNet" Version="5.4.1" />
<PackageVersion Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
<PackageVersion Include="linq2db.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="MailKit" Version="4.7.1.1" />
<PackageVersion Include="Meziantou.Extensions.Logging.Xunit" Version="1.0.7" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.10" />
Expand All @@ -37,25 +37,26 @@
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.15" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
<PackageVersion Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
Expand All @@ -71,9 +72,9 @@
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
<PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
<PackageVersion Include="Npgsql" Version="8.0.6" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.6" />
<PackageVersion Include="Npgsql" Version="9.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.3" />
<PackageVersion Include="NReco.Logging.File" Version="1.2.1" />
<PackageVersion Include="OpenIddict.AspNetCore" Version="5.8.0" />
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="5.8.0" />
Expand Down Expand Up @@ -110,9 +111,9 @@
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Reactive" Version="6.0.1" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.0" />
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.4" />
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.4" />
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
<PackageVersion Include="SystemTextJson.JsonDiffPatch" Version="2.0.0" />
<PackageVersion Include="SystemTextJsonPatch" Version="3.2.1" />
<PackageVersion Include="tusdotnet" Version="2.8.0" />
Expand Down
2 changes: 1 addition & 1 deletion backend/FwLite/LcmCrdt.Tests/DataModelSnapshotTests.VerifyDbModel.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,4 +370,4 @@
Relational:ViewName:
Relational:ViewSchema:
Annotations:
ProductVersion: 8.0.15
ProductVersion: 9.0.4
1 change: 1 addition & 0 deletions backend/FwLite/LcmCrdt/LcmCrdt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
<PackageReference Include="Refit" />
Expand Down
1 change: 1 addition & 0 deletions backend/FwLite/LcmDebugger/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using LexCore.Exceptions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Refit;
using SIL.Harmony;
Expand Down
1 change: 0 additions & 1 deletion backend/LexBoxApi/LexBoxApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" />
<PackageReference Include="CrystalQuartz.AspNetCore" />
<PackageReference Include="DataAnnotatedModelValidations" />
<PackageReference Include="HotChocolate.Analyzers" />
Expand Down
4 changes: 0 additions & 4 deletions backend/LexBoxApi/ScheduledTasksKernel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ public static class ScheduledTasksKernel
{
public static void AddScheduledTasks(this IServiceCollection services, IConfiguration configuration)
{
services.ConfigureDbModel(builder =>
{
builder.AddQuartz(b => b.UsePostgreSql());
});
services.AddQuartz(q =>
{
q.UsePersistentStore(options =>
Expand Down
26 changes: 26 additions & 0 deletions backend/LexData/DbStartupService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using System.Diagnostics;
using System.Net.Sockets;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -59,6 +62,7 @@ private async Task<bool> TryMigrate(DbContext dbContext, CancellationToken cance
{
try
{

// there's a method to check if we can connect, but that won't work when the database is not created yet.
await dbContext.Database.MigrateAsync(cancellationToken);
return true;
Expand All @@ -84,6 +88,28 @@ private async Task<bool> TryMigrate(DbContext dbContext, CancellationToken cance
}
}

//this is mostly just for debugging diffs
private void DetermineModelDiffs(DbContext dbContext)
{
var migrationsAssembly = dbContext.Database.GetService<IMigrationsAssembly>();
var designTimeModel = dbContext.Database.GetService<IDesignTimeModel>();
var modelRuntimeInitializer = dbContext.Database.GetService<IModelRuntimeInitializer>();
var migrationsModelDiffer = dbContext.Database.GetService<IMigrationsModelDiffer>();
var diffs = migrationsModelDiffer.GetDifferences(
modelRuntimeInitializer.Initialize(migrationsAssembly.ModelSnapshot!.Model).GetRelationalModel(),
designTimeModel.Model.GetRelationalModel());
if (diffs.Count > 0)
{
foreach (var migrationOperation in diffs)
{
_logger.LogInformation("Model Diffs:{Diff}", migrationOperation);
}
}
else
{
_logger.LogInformation("No model diffs");
}
}
public Task StopAsync(CancellationToken cancellationToken)
{
return Task.CompletedTask;
Expand Down
4 changes: 3 additions & 1 deletion backend/LexData/LexBoxDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using AppAny.Quartz.EntityFrameworkCore.Migrations;
using AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL;
using LexCore.Entities;
using LexData.Configuration;
using Microsoft.EntityFrameworkCore;
Expand All @@ -12,9 +14,9 @@ public class LexBoxDbContext(DbContextOptions<LexBoxDbContext> options, IEnumera

protected override void OnModelCreating(ModelBuilder modelBuilder)
{

modelBuilder.HasCollation(CaseInsensitiveCollation, locale: "und-u-ks-level2", provider: "icu", deterministic: false);
modelBuilder.ApplyConfigurationsFromAssembly(typeof(EntityBaseConfiguration<>).Assembly);
modelBuilder.AddQuartz(b => b.UsePostgreSql());
foreach (var configureDbModel in _configureDbModels)
{
configureDbModel.Configure(modelBuilder);
Expand Down
3 changes: 2 additions & 1 deletion backend/LexData/LexData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL"/>
<PackageReference Include="EntityFrameworkCore.Projectables" />
<PackageReference Include="Humanizer.Core" />
<PackageReference Include="linq2db.AspNet" />
Expand All @@ -20,4 +21,4 @@
<ProjectReference Include="..\harmony\src\SIL.Harmony.Core\SIL.Harmony.Core.csproj" />
<ProjectReference Include="..\LexCore\LexCore.csproj" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion backend/harmony
Open in desktop
Submodule harmony updated 2 files
+4 −4 Directory.Packages.props
+1 −0 src/SIL.Harmony.Tests/DbContextTests.VerifyModel.verified.txt
Loading