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/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) { 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..55b960a 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..291996f 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..e6d19ea 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..72774ed 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,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 fe0db7a..3003f95 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 - + - - - + + +