From 3afbe34bed319bc16e34c188cf48d54542a831da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?= Date: Tue, 21 Jan 2025 12:57:11 -0500 Subject: [PATCH 1/3] Upgrading to 9.0 --- .github/workflows/codeql.yml | 6 +++--- Dockerfile | 4 ++-- .../Nullinside.Api.Common.AspNetCore.csproj | 11 ++++++----- .../Nullinside.Api.Common.csproj | 9 +++++---- src/Nullinside.Api.Model/Nullinside.Api.Model.csproj | 11 ++++++----- src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj | 11 ++++++----- src/Nullinside.Api/Nullinside.Api.csproj | 11 ++++++----- 7 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0a9ab94..8b5faaf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -34,7 +34,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x # Execute the build - name: Execute Release Build @@ -54,7 +54,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x # Execute the tests - name: Execute Tests @@ -114,7 +114,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x # Execute the build - name: Execute Build diff --git a/Dockerfile b/Dockerfile index 8e8bafb..ec80263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/Nullinside.Api/Nullinside.Api.csproj", "src/Nullinside.Api/"] diff --git a/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj b/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj index 884a8aa..639ccd2 100644 --- a/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj +++ b/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj @@ -1,9 +1,10 @@  - net8.0 + net9.0 enable enable + default @@ -16,13 +17,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + diff --git a/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj b/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj index f1c4e1f..c96c6b6 100644 --- a/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj +++ b/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj @@ -1,9 +1,10 @@  - net8.0 + net9.0 enable enable + default @@ -16,10 +17,10 @@ - - + + - + diff --git a/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj b/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj index 73a0acc..6354061 100644 --- a/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj +++ b/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj @@ -1,9 +1,10 @@  - net8.0 + net9.0 enable enable + default @@ -16,13 +17,13 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj b/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj index abeef21..4e0f03f 100644 --- a/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj +++ b/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj @@ -1,9 +1,10 @@ - net8.0 + net9.0 enable enable + default false true @@ -14,13 +15,13 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Nullinside.Api/Nullinside.Api.csproj b/src/Nullinside.Api/Nullinside.Api.csproj index fe0db7a..e7bbcd9 100644 --- a/src/Nullinside.Api/Nullinside.Api.csproj +++ b/src/Nullinside.Api/Nullinside.Api.csproj @@ -1,13 +1,14 @@ - net8.0 + net9.0 enable enable true Linux true en-US + default @@ -24,16 +25,16 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - + + From 3696f254bb3a5a1017108a8c7fee39b8c066cb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?= Date: Tue, 21 Jan 2025 13:28:21 -0500 Subject: [PATCH 2/3] fix: exception when calling database There appears to be a bug in the current version of the MySQL entity framework implementation where using the string's ".Equals" results in a "LCASE" command that throws a null reference exception. Since MySQL is not case sensitive we can simple remove this part of the database calls for now... --- .../Middleware/BasicAuthenticationHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs b/src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs index 9d1a321..ca1b877 100644 --- a/src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs +++ b/src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs @@ -60,7 +60,7 @@ protected override async Task HandleAuthenticateAsync() { .Include(i => i.Roles) .AsNoTracking() .FirstOrDefaultAsync(u => !string.IsNullOrWhiteSpace(u.Token) && - u.Token.Equals(token, StringComparison.InvariantCultureIgnoreCase) && + u.Token == token && !u.IsBanned); if (null == dbUser) { From 8b7d10067b68e2eeff3859e7f45addeecf081e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?= Date: Mon, 28 Apr 2025 17:10:22 -0400 Subject: [PATCH 3/3] fix: swapping MySql.EntityFrameworkCore package The current package has a bug where trying to do a database migration results in a invalid cast exception. This re-published package fixes the issue. --- .../Nullinside.Api.Common.AspNetCore.csproj | 8 ++++---- src/Nullinside.Api.Common/Nullinside.Api.Common.csproj | 4 ++-- src/Nullinside.Api.Model/Nullinside.Api.Model.csproj | 8 ++++---- src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj | 10 +++++----- src/Nullinside.Api/Nullinside.Api.csproj | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj b/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj index 639ccd2..55b960a 100644 --- a/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj +++ b/src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj @@ -17,13 +17,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + diff --git a/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj b/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj index c96c6b6..291996f 100644 --- a/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj +++ b/src/Nullinside.Api.Common/Nullinside.Api.Common.csproj @@ -18,9 +18,9 @@ - + - + diff --git a/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj b/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj index 6354061..e6d19ea 100644 --- a/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj +++ b/src/Nullinside.Api.Model/Nullinside.Api.Model.csproj @@ -17,13 +17,13 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj b/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj index 4e0f03f..72774ed 100644 --- a/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj +++ b/src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj @@ -15,14 +15,14 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Nullinside.Api/Nullinside.Api.csproj b/src/Nullinside.Api/Nullinside.Api.csproj index e7bbcd9..3003f95 100644 --- a/src/Nullinside.Api/Nullinside.Api.csproj +++ b/src/Nullinside.Api/Nullinside.Api.csproj @@ -25,16 +25,16 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - - + + +