Skip to content

Commit 7407036

Browse files
Merge pull request #73 from nullinside-development-group/feature/9.0
Feature/9.0
2 parents 9365981 + 8b7d100 commit 7407036

File tree

8 files changed

+35
-30
lines changed

8 files changed

+35
-30
lines changed

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install .NET Core
3535
uses: actions/setup-dotnet@v3
3636
with:
37-
dotnet-version: 8.x.x
37+
dotnet-version: 9.x.x
3838

3939
# Execute the build
4040
- name: Execute Release Build
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install .NET Core
5555
uses: actions/setup-dotnet@v3
5656
with:
57-
dotnet-version: 8.x.x
57+
dotnet-version: 9.x.x
5858

5959
# Execute the tests
6060
- name: Execute Tests
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install .NET Core
115115
uses: actions/setup-dotnet@v3
116116
with:
117-
dotnet-version: 8.x.x
117+
dotnet-version: 9.x.x
118118

119119
# Execute the build
120120
- name: Execute Build

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
USER $APP_UID
33
WORKDIR /app
44
EXPOSE 8080
55
EXPOSE 8081
66

7-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
88
ARG BUILD_CONFIGURATION=Release
99
WORKDIR /src
1010
COPY ["src/Nullinside.Api/Nullinside.Api.csproj", "src/Nullinside.Api/"]

src/Nullinside.Api.Common.AspNetCore/Middleware/BasicAuthenticationHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync() {
6060
.Include(i => i.Roles)
6161
.AsNoTracking()
6262
.FirstOrDefaultAsync(u => !string.IsNullOrWhiteSpace(u.Token) &&
63-
u.Token.Equals(token, StringComparison.InvariantCultureIgnoreCase) &&
63+
u.Token == token &&
6464
!u.IsBanned);
6565

6666
if (null == dbUser) {

src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<LangVersion>default</LangVersion>
78
</PropertyGroup>
89

910
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -16,13 +17,13 @@
1617
</PropertyGroup>
1718

1819
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2122
<PrivateAssets>all</PrivateAssets>
2223
</PackageReference>
23-
<PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.8"/>
24-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
25-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
24+
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
26+
<PackageReference Include="System.Text.Json" Version="9.0.4" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

src/Nullinside.Api.Common/Nullinside.Api.Common.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<LangVersion>default</LangVersion>
78
</PropertyGroup>
89

910
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -16,10 +17,10 @@
1617
</PropertyGroup>
1718

1819
<ItemGroup>
19-
<PackageReference Include="log4net" Version="2.0.17"/>
20-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1"/>
20+
<PackageReference Include="log4net" Version="2.0.17" />
21+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
2122
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
22-
<PackageReference Include="SSH.NET" Version="2024.2.0"/>
23+
<PackageReference Include="SSH.NET" Version="2025.0.0" />
2324
<PackageReference Include="TwitchLib.Api" Version="3.9.0"/>
2425
<PackageReference Include="TwitchLib.Client" Version="3.3.1"/>
2526
</ItemGroup>

src/Nullinside.Api.Model/Nullinside.Api.Model.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<LangVersion>default</LangVersion>
78
</PropertyGroup>
89

910
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -16,13 +17,13 @@
1617
</PropertyGroup>
1718

1819
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
20+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
2122
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2223
<PrivateAssets>all</PrivateAssets>
2324
</PackageReference>
24-
<PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.8" />
25-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
25+
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3" />
26+
<PackageReference Include="System.Text.Json" Version="9.0.4" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<LangVersion>default</LangVersion>
78

89
<IsPackable>false</IsPackable>
910
<IsTestProject>true</IsTestProject>
@@ -14,14 +15,14 @@
1415
</PropertyGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.13" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.13" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
1920
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2021
<PackageReference Include="Moq" Version="4.20.72"/>
2122
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2223
<PackageReference Include="NUnit" Version="4.3.2" />
2324
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
25+
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
2526
<PrivateAssets>all</PrivateAssets>
2627
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2728
</PackageReference>

src/Nullinside.Api/Nullinside.Api.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<InvariantGlobalization>true</InvariantGlobalization>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1010
<NeutralLanguage>en-US</NeutralLanguage>
11+
<LangVersion>default</LangVersion>
1112
</PropertyGroup>
1213

1314
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -24,16 +25,16 @@
2425
<PackageReference Include="Google.Apis.Oauth2.v2" Version="1.68.0.1869"/>
2526
<PackageReference Include="log4net" Version="2.0.17" />
2627
<PackageReference Include="log4net.Ext.Json" Version="2.0.10.1" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
2829
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2930
<PrivateAssets>all</PrivateAssets>
3031
</PackageReference>
3132
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0"/>
32-
<PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.8"/>
33+
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3" />
3334
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
34-
<PackageReference Include="SSH.NET" Version="2024.2.0" />
35-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
36-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
35+
<PackageReference Include="SSH.NET" Version="2025.0.0" />
36+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
37+
<PackageReference Include="System.Text.Json" Version="9.0.4" />
3738
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3839
<PackageReference Include="TwitchLib.Api" Version="3.9.0"/>
3940
</ItemGroup>

0 commit comments

Comments
 (0)