Skip to content

Commit 5ada52e

Browse files
impworksimpworks
committed
Updated runtime to .NET 9. Closes #303.
1 parent ec12929 commit 5ada52e

4 files changed

Lines changed: 37 additions & 29 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN npm ci
1010
ADD src/Bonsai .
1111
RUN node_modules/.bin/gulp build
1212

13-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine as net-builder
13+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine as net-builder
1414
ARG TARGETARCH
1515
ARG TARGETVARIANT
1616

‎src/Bonsai.Tests.Search/Bonsai.Tests.Search.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
12-
<PackageReference Include="xunit" Version="2.8.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="xunit" Version="2.9.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

‎src/Bonsai/Bonsai.csproj‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Authors>Impworks</Authors>
66
<Description>Family wiki engine</Description>
77
<UserSecretsId>4d988f1f-6a19-42a7-aa8f-62a8f3619830</UserSecretsId>
@@ -57,45 +57,45 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<PackageReference Include="AspNet.Security.OAuth.Vkontakte" Version="8.0.0" />
61-
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="8.0.0" />
60+
<PackageReference Include="AspNet.Security.OAuth.Vkontakte" Version="9.0.0" />
61+
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="9.0.0" />
6262
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
6363
<PackageReference Include="htmldiff.net-core" Version="1.3.6" />
6464
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
6565
<PackageReference Include="Humanizer.Core.ru" Version="2.14.1" />
66-
<PackageReference Include="Impworks.Utils" Version="1.0.54" />
66+
<PackageReference Include="Impworks.Utils" Version="1.0.55" />
6767
<PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0" />
68-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
68+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
6969
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00007" />
7070
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00007" />
7171
<PackageReference Include="Lucene.Net.Highlighter" Version="4.8.0-beta00007" />
7272
<PackageReference Include="Lucene.Net.Memory" Version="4.8.0-beta00007" />
7373
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00007" />
7474
<PackageReference Include="Mapster" Version="7.4.0" />
7575
<PackageReference Include="Mapster.EFCore" Version="5.1.1" />
76-
<PackageReference Include="Markdig" Version="0.37.0" />
76+
<PackageReference Include="Markdig" Version="0.38.0" />
7777
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
78-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.5" />
79-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.5" />
80-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
81-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
82-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.5" />
83-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
84-
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.5" />
85-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
86-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
78+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0" />
79+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0" />
80+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
81+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
82+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
83+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
84+
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0" />
85+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
86+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
8787
<PrivateAssets>all</PrivateAssets>
8888
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8989
</PackageReference>
90-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
90+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
9191
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
92-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
93-
<PackageReference Include="Serilog" Version="3.1.1" />
94-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
95-
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
96-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
97-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
98-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.8" />
92+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
93+
<PackageReference Include="Serilog" Version="4.2.0" />
94+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
95+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
96+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
97+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
98+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
9999
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
100100
</ItemGroup>
101101

‎src/Bonsai/Data/AppDbContext.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Bonsai.Data.Models;
44
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
55
using Microsoft.EntityFrameworkCore;
6+
using Microsoft.EntityFrameworkCore.Diagnostics;
67
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
78

89
namespace Bonsai.Data;
@@ -34,6 +35,13 @@ public AppDbContext(DbContextOptions<AppDbContext> options)
3435
public virtual DbSet<PageReference> PageReferences => Set<PageReference>();
3536
public virtual DbSet<TreeLayout> TreeLayouts => Set<TreeLayout>();
3637

38+
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
39+
{
40+
optionsBuilder.ConfigureWarnings(x => x.Ignore(RelationalEventId.PendingModelChangesWarning));
41+
42+
base.OnConfiguring(optionsBuilder);
43+
}
44+
3745
protected override void OnModelCreating(ModelBuilder builder)
3846
{
3947
base.OnModelCreating(builder);

0 commit comments

Comments
 (0)