Skip to content

Commit c80941f

Browse files
mythzmythz
committed
upgrade to .NET 10
1 parent c27826a commit c80941f

11 files changed

Lines changed: 48 additions & 84 deletions

File tree

‎.github/workflows/build-container.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: steps.check_client.outputs.requires_npm == 'true'
5353
uses: actions/setup-node@v3
5454
with:
55-
node-version: 22
55+
node-version: 24
5656

5757
- name: Install npm dependencies
5858
if: steps.check_client.outputs.requires_npm == 'true'
@@ -87,9 +87,9 @@ jobs:
8787
password: ${{ env.KAMAL_REGISTRY_PASSWORD }}
8888

8989
- name: Setup .NET
90-
uses: actions/setup-dotnet@v4
90+
uses: actions/setup-dotnet@v5
9191
with:
92-
dotnet-version: '8.0'
92+
dotnet-version: 10.x
9393

9494
- name: Set up Docker Buildx
9595
uses: docker/setup-buildx-action@v3

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
# https://okai.servicestack.com/dropbox/ubixar.txt
4343

4444
- name: Setup dotnet
45-
uses: actions/setup-dotnet@v3
45+
uses: actions/setup-dotnet@v5
4646
with:
47-
dotnet-version: '8.*'
47+
dotnet-version: 10.x
4848

4949
- name: build
5050
run: dotnet build

‎MyApp.Server/MyApp.Server.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>ServiceStack</RootNamespace>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="ServiceStack" Version="8.*" />
12-
<PackageReference Include="ServiceStack.Ormlite" Version="8.*" />
13-
<PackageReference Include="ServiceStack.Server" Version="8.*" />
11+
<PackageReference Include="ServiceStack" Version="10.*" />
12+
<PackageReference Include="ServiceStack.Ormlite" Version="10.*" />
13+
<PackageReference Include="ServiceStack.Server" Version="10.*" />
1414
<PackageReference Include="Cronos" Version="0.11.1" />
1515
</ItemGroup>
1616

‎MyApp.ServiceInterface/MyApp.ServiceInterface.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
11-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.*" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.*" />
13-
<PackageReference Include="ServiceStack" Version="8.*" />
14-
<PackageReference Include="ServiceStack.Ormlite" Version="8.*" />
15-
<PackageReference Include="ServiceStack.Ormlite.Sqlite.Data" Version="8.*" />
16-
<PackageReference Include="ServiceStack.Server" Version="8.*" />
10+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.*" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.*" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.*" />
13+
<PackageReference Include="ServiceStack" Version="10.*" />
14+
<PackageReference Include="ServiceStack.Ormlite" Version="10.*" />
15+
<PackageReference Include="ServiceStack.Ormlite.Sqlite.Data" Version="10.*" />
16+
<PackageReference Include="ServiceStack.Server" Version="10.*" />
1717
<PackageReference Include="SkiaSharp" Version="3.119.0" />
1818
<PackageReference Include="Cronos" Version="0.11.1" />
1919
</ItemGroup>

‎MyApp.ServiceModel/MyApp.ServiceModel.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ServiceStack.Interfaces" Version="8.*" />
10+
<PackageReference Include="ServiceStack.Interfaces" Version="10.*" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎MyApp.Tests/MyApp.Tests.csproj‎

Lines changed: 4 additions & 4 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>net10.0</TargetFramework>
55
<!-- <Nullable>enable</Nullable>-->
66
<ImplicitUsings>enable</ImplicitUsings>
77
<DebugType>portable</DebugType>
@@ -16,9 +16,9 @@
1616
<PackageReference Include="NUnit" Version="3.*" />
1717
<PackageReference Include="NUnit3TestAdapter" Version="4.*" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
19-
<PackageReference Include="ServiceStack" Version="8.*" />
20-
<PackageReference Include="ServiceStack.Kestrel" Version="8.*" />
21-
<PackageReference Include="ServiceStack.OrmLite.PostgreSQL" Version="8.*" />
19+
<PackageReference Include="ServiceStack" Version="10.*" />
20+
<PackageReference Include="ServiceStack.Kestrel" Version="10.*" />
21+
<PackageReference Include="ServiceStack.OrmLite.PostgreSQL" Version="10.*" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎MyApp.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "overview", "overview", "{14
1616
plan.md = plan.md
1717
EndProjectSection
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyApp.AI", "MyApp.AI\MyApp.AI.csproj", "{D7860095-8FF8-4289-99B1-B917E970D9B6}"
20-
EndProject
2119
Global
2220
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2321
Debug|Any CPU = Debug|Any CPU
@@ -40,10 +38,6 @@ Global
4038
{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
4139
{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
4240
{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{D7860095-8FF8-4289-99B1-B917E970D9B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{D7860095-8FF8-4289-99B1-B917E970D9B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{D7860095-8FF8-4289-99B1-B917E970D9B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{D7860095-8FF8-4289-99B1-B917E970D9B6}.Release|Any CPU.Build.0 = Release|Any CPU
4741
EndGlobalSection
4842
GlobalSection(SolutionProperties) = preSolution
4943
HideSolutionNode = FALSE

‎MyApp.slnx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Solution>
2+
<Folder Name="/overview/">
3+
<File Path="plan.md" />
4+
</Folder>
5+
<Project Path="MyApp.ServiceInterface/MyApp.ServiceInterface.csproj" />
6+
<Project Path="MyApp.ServiceModel/MyApp.ServiceModel.csproj" />
7+
<Project Path="MyApp.Tests/MyApp.Tests.csproj" />
8+
<Project Path="MyApp/MyApp.csproj" />
9+
</Solution>

‎MyApp/Configure.OpenApi.cs‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎MyApp/Configure.ServerEvents.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NET9_0_OR_GREATER
1+
#if false
22
using System.Net;
33
using Microsoft.AspNetCore.Authentication;
44
using Microsoft.AspNetCore.Mvc;

0 commit comments

Comments
 (0)