Skip to content

Commit 2093a5e

Browse files
selfdocumentingcodeselfdocumentingcode
authored
Merge pull request #315 from selfdocumentingcode/chore/dotnet9
Chore/dotnet9
2 parents be0ae37 + 9299378 commit 2093a5e

10 files changed

Lines changed: 32 additions & 28 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232

3333
- name: Setup .NET Core
3434
uses: actions/setup-dotnet@v4
35-
with:
36-
dotnet-version: 8.0.x
3735

3836
- name: Install GitVersion
3937
uses: gittools/actions/gitversion/setup@v3

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.304",
4+
"rollForward": "latestMinor"
5+
}
6+
}

‎src/Kattbot.Common/Kattbot.Common.csproj‎

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

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

77
<ItemGroup>

‎src/Kattbot.Data.Migrations/Kattbot.Data.Migrations.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<UserSecretsId>bc907d8f-4d2f-41fe-9b68-79e021dd3545</UserSecretsId>
66
</PropertyGroup>
77

@@ -18,15 +18,15 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
29-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.8" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
29+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
3030
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Kattbot.Data/Kattbot.Data.csproj‎

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

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

77
<ItemGroup>
8-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
8+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
99
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Kattbot/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base
22

3-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
3+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
44
ARG BUILD_CONFIGURATION=Debug
55
WORKDIR /src
66
COPY ["Directory.Build.props", "."]

‎src/Kattbot/Kattbot.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<UserSecretsId>dotnet-Kattbot-79CAD254-2C56-430B-8B4B-16AA8DA8808D</UserSecretsId>
66
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
77
</PropertyGroup>
@@ -18,19 +18,19 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.8" />
2222
<PackageReference Include="TiktokenSharp" Version="1.1.7" />
2323
<PackageReference Include="CommandLineArgumentsParser" Version="3.0.23" />
2424
<PackageReference Include="DSharpPlus" Version="5.0.0-alpha.5" />
2525
<PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-alpha.5" />
2626
<PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-alpha.5" />
27-
<PackageReference Include="MediatR" Version="12.5.0" />
28-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
31-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
27+
<PackageReference Include="MediatR" Version="13.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.8" />
30+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
31+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
3232
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
33-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5" />
33+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
3434
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Kattbot/prod.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
ARG BUILD_CONFIGURATION=Release
33
WORKDIR /src
44
COPY ["Directory.Build.props", "."]
@@ -27,7 +27,7 @@ ARG BUILD_CONFIGURATION=Release
2727
RUN dotnet ef migrations script --no-build --configuration $BUILD_CONFIGURATION --idempotent -p Kattbot.Data.Migrations -o /output/migrations/database_migration.sql
2828
COPY --from=build /src/kattbot-backup-db.sh /output/migrations/
2929

30-
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS final
30+
FROM mcr.microsoft.com/dotnet/runtime:9.0 AS final
3131
WORKDIR /app
3232
COPY --from=publish /output/publish .
3333
COPY --from=migrations /output/migrations ./migrations/

‎tests/Kattbot.Tests/ImageServiceTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Kattbot.Tests;
1414
[Ignore] // Can't save to /tmp on GitHub Actions. TODO: fix
1515
public class ImageServiceTests
1616
{
17-
[DataTestMethod]
17+
[TestMethod]
1818
[DataRow("cute_cat.jpg")]
1919
[DataRow("froge.png")]
2020
public async Task EnsureMaxSize_DownscalesImageIfNeeded(string inputFilename)
@@ -32,7 +32,7 @@ public async Task EnsureMaxSize_DownscalesImageIfNeeded(string inputFilename)
3232
Assert.IsTrue(resizedImageSize <= maxSizeMb);
3333
}
3434

35-
[DataTestMethod]
35+
[TestMethod]
3636
[DataRow("slowpoke.jpg", "jpg")]
3737
[DataRow("slowpoke.png", "png")]
3838
[DataRow("slowpoke.webp", "webp")]

‎tests/Kattbot.Tests/Kattbot.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<IsPublishable>false</IsPublishable>
77
</PropertyGroup>
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1111
<PackageReference Include="MSTest.TestAdapter" Version="3.10.1" />
1212
<PackageReference Include="MSTest.TestFramework" Version="3.10.1" />
13-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
13+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
1414
<PackageReference Include="NSubstitute" Version="5.3.0" />
1515
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
1616
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)