Skip to content

Commit 9cd22aa

Browse files
ProgrammingByPermutationProgrammingByPermutation
authored
Merge pull request #140 from nullinside-development-group/chore/update
chore: upgrading to .net 10
2 parents a2f0bc0 + b560080 commit 9cd22aa

File tree

8 files changed

+23
-44
lines changed

8 files changed

+23
-44
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: 9.x.x
37+
dotnet-version: 10.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: 9.x.x
57+
dotnet-version: 10.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: 9.x.x
117+
dotnet-version: 10.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:9.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
22
USER $APP_UID
33
WORKDIR /app
44
EXPOSE 8080
55
EXPOSE 8081
66

7-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:10.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/Nullinside.Api.Common.AspNetCore.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>default</LangVersion>
@@ -17,13 +17,11 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
24-
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3"/>
25-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
26-
<PackageReference Include="System.Text.Json" Version="9.0.10" />
24+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
2725
</ItemGroup>
2826

2927
<ItemGroup>

‎src/Nullinside.Api.Common/Nullinside.Api.Common.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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>default</LangVersion>
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="log4net" Version="3.2.0"/>
22-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
22+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
2323
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
2424
<PackageReference Include="SSH.NET" Version="2025.1.0" />
2525
<PackageReference Include="TwitchLib.Api" Version="3.10.2" />

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

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>default</LangVersion>
@@ -17,13 +17,12 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
20+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3"/>
26-
<PackageReference Include="System.Text.Json" Version="9.0.10" />
25+
<PackageReference Include="MySql.EntityFrameworkCore" Version="10.0.0-rc" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

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

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>default</LangVersion>
@@ -15,14 +15,14 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2121
<PackageReference Include="Moq" Version="4.20.72"/>
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
2323
<PackageReference Include="NUnit" Version="4.4.0"/>
2424
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
25-
<PackageReference Include="NUnit.Analyzers" Version="4.11.1">
25+
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>

‎src/Nullinside.Api/Nullinside.Api.csproj‎

Lines changed: 3 additions & 6 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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<InvariantGlobalization>true</InvariantGlobalization>
@@ -25,17 +25,14 @@
2525
<PackageReference Include="Google.Apis.Oauth2.v2" Version="1.68.0.1869"/>
2626
<PackageReference Include="log4net" Version="3.2.0"/>
2727
<PackageReference Include="log4net.Ext.Json" Version="3.0.3"/>
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>
3232
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0"/>
33-
<PackageReference Include="Nullinside.MySql.EntityFrameworkCore" Version="9.0.3"/>
3433
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
3534
<PackageReference Include="SSH.NET" Version="2025.1.0" />
36-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
37-
<PackageReference Include="System.Text.Json" Version="9.0.10" />
38-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
35+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
3936
<PackageReference Include="TwitchLib.Api" Version="3.10.2" />
4037
</ItemGroup>
4138

‎src/Nullinside.Api/Program.cs‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.AspNetCore.Authentication;
44
using Microsoft.AspNetCore.Authorization;
55
using Microsoft.EntityFrameworkCore;
6-
using Microsoft.OpenApi.Models;
6+
using Microsoft.OpenApi;
77

88
using Nullinside.Api.Common;
99
using Nullinside.Api.Common.AspNetCore.Middleware;
@@ -77,21 +77,6 @@
7777
Scheme = "Bearer"
7878
});
7979

80-
c.AddSecurityRequirement(new OpenApiSecurityRequirement {
81-
{
82-
new OpenApiSecurityScheme {
83-
Reference = new OpenApiReference {
84-
Type = ReferenceType.SecurityScheme,
85-
Id = "Bearer"
86-
},
87-
Scheme = "oauth2",
88-
Name = "Bearer",
89-
In = ParameterLocation.Header
90-
},
91-
new List<string>()
92-
}
93-
});
94-
9580
string xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
9681
string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
9782
c.IncludeXmlComments(xmlPath);

0 commit comments

Comments
 (0)