webapps/term_concordancer
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Upgrade packages to .net 10

Browse Source
This commit is contained in:
rrejc
2026-06-08 13:40:48 +02:00
parent 5bd50d1f55
commit 227c46827f
6 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Directory.Build.props
+1 -1
View File
@@ -1,6 +1,6 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableNETAnalyzers>false</EnableNETAnalyzers> <EnableNETAnalyzers>false</EnableNETAnalyzers>
<Version>1.0.4</Version> <Version>1.0.4</Version>
src/Directory.Packages.props
+33 -33
View File
@@ -4,40 +4,40 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Autofac" Version="6.4.0" /> <PackageVersion Include="Autofac" Version="9.1.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="11.0.0" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="coverlet.collector" Version="3.1.2" /> <PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="EFCore.NamingConventions" Version="6.0.0" /> <PackageVersion Include="EFCore.NamingConventions" Version="10.0.1" />
<PackageVersion Include="FluentMigrator" Version="3.3.2" /> <PackageVersion Include="FluentMigrator" Version="8.0.1" />
<PackageVersion Include="FluentMigrator.Runner" Version="3.3.2" /> <PackageVersion Include="FluentMigrator.Runner" Version="8.0.1" />
<PackageVersion Include="FluentMigrator.Runner.Postgres" Version="3.3.2" /> <PackageVersion Include="FluentMigrator.Runner.Postgres" Version="8.0.1" />
<PackageVersion Include="FluentValidation" Version="11.2.2" /> <PackageVersion Include="FluentValidation" Version="12.1.1" />
<PackageVersion Include="Hangfire" Version="1.7.31" /> <PackageVersion Include="Hangfire" Version="1.8.23" />
<PackageVersion Include="Hangfire.Core" Version="1.7.31" /> <PackageVersion Include="Hangfire.Core" Version="1.8.23" />
<PackageVersion Include="Hangfire.PostgreSql" Version="1.9.9" /> <PackageVersion Include="Hangfire.PostgreSql" Version="1.21.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.9" /> <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" /> <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" /> <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" /> <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.8" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" /> <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Npgsql" Version="6.0.7" /> <PackageVersion Include="Npgsql" Version="10.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.7" /> <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
<PackageVersion Include="OpenSearch.Client" Version="1.1.0" /> <PackageVersion Include="OpenSearch.Client" Version="1.8.0" />
<PackageVersion Include="Rsdo.StyleCop" Version="1.0.0" /> <PackageVersion Include="Rsdo.StyleCop" Version="1.0.0" />
<PackageVersion Include="Serilog.AspNetCore" Version="6.0.1" /> <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageVersion Include="Serilog.Expressions" Version="3.4.1" /> <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="3.4.0" /> <PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" /> <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.Email" Version="2.4.0" /> <PackageVersion Include="Serilog.Sinks.Email" Version="4.2.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.4.0" /> <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" /> <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.1" />
<PackageVersion Include="xunit" Version="2.4.2" /> <PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" /> <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>
src/apps/Rsdo.Concordancer.Api/Controllers/ServiceApiInfo.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System; using System;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi;
namespace Rsdo.Concordancer.Api.Controllers; namespace Rsdo.Concordancer.Api.Controllers;
src/apps/Rsdo.Concordancer.Api/Framework/SerilogExtensions.cs
+13 -13
View File
@@ -1,9 +1,9 @@
using System; using System;
using System.Net; using System.Net;
using MailKit.Security;
using Serilog; using Serilog;
using Serilog.Configuration; using Serilog.Configuration;
using Serilog.Events; using Serilog.Events;
using Serilog.Sinks.Email;
namespace Rsdo.Concordancer.Api.Framework; namespace Rsdo.Concordancer.Api.Framework;
@@ -23,25 +23,25 @@ public static class SerilogExtensions
int batchPostingLimit = 100, int batchPostingLimit = 100,
string mailSubject = "Log Email") string mailSubject = "Log Email")
{ {
var connectionInfo = new EmailConnectionInfo() NetworkCredential credentials = null;
{
FromEmail = fromEmail,
ToEmail = toEmail,
EmailSubject = mailSubject,
MailServer = mailServer,
Port = port,
EnableSsl = enableSsl,
};
if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password)) if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password))
{ {
connectionInfo.NetworkCredentials = new NetworkCredential() credentials = new NetworkCredential()
{ {
UserName = userName, UserName = userName,
Password = password, Password = password,
}; };
} }
return sinkConfiguration.Email(connectionInfo: connectionInfo, restrictedToMinimumLevel: restrictedToMinimumLevel); return sinkConfiguration.Email(
from: fromEmail,
to: toEmail,
host: mailServer,
port: port,
connectionSecurity: enableSsl ? SecureSocketOptions.Auto : SecureSocketOptions.None,
credentials: credentials,
subject: mailSubject,
body: outputTemplate,
restrictedToMinimumLevel: restrictedToMinimumLevel);
} }
} }
src/apps/Rsdo.Concordancer.Api/Startup.cs
+6 -2
View File
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi;
using Rsdo.Concordancer.Api.Controllers; using Rsdo.Concordancer.Api.Controllers;
using Rsdo.Concordancer.Api.Framework; using Rsdo.Concordancer.Api.Framework;
using Rsdo.Concordancer.Core.Constants; using Rsdo.Concordancer.Core.Constants;
@@ -85,7 +85,11 @@ public class Startup
// we would have to build the container which would (at this point) double singletons. // we would have to build the container which would (at this point) double singletons.
// So we are duplicated code from ConnectionStringProvider // So we are duplicated code from ConnectionStringProvider
var connectionString = Configuration[ConfigurationKey.Database.MasterConnectionString]; var connectionString = Configuration[ConfigurationKey.Database.MasterConnectionString];
x.UsePostgreSqlStorage(connectionString); x.UsePostgreSqlStorage(
options =>
{
options.UseNpgsqlConnection(connectionString);
});
x.UseMediator(); x.UseMediator();
}); });
services.AddHangfireServer(); services.AddHangfireServer();
src/core/Rsdo.Concordancer.Data/Framework/VersionInfoTableMetadata.cs
+2
View File
@@ -14,6 +14,8 @@ public class VersionInfoTableMetadata : IVersionTableMetaData
public string UniqueIndexName => "uc_version"; public string UniqueIndexName => "uc_version";
public bool CreateWithPrimaryKey => true;
public object ApplicationContext { get; set; } public object ApplicationContext { get; set; }
public bool OwnsSchema => true; public bool OwnsSchema => true;