Skip to content

Commit 87b3882

Browse files
mythzmythz
committed
Upgrade to .NET 10
1 parent 66e3a1a commit 87b3882

File tree

8 files changed

+41
-82
lines changed

8 files changed

+41
-82
lines changed

‎MyApp.ServiceInterface/MyApp.ServiceInterface.csproj‎

Lines changed: 5 additions & 5 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
</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="ServiceStack" Version="8.*" />
13-
<PackageReference Include="ServiceStack.Ormlite" Version="8.*" />
10+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.*" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.*" />
12+
<PackageReference Include="ServiceStack" Version="10.*" />
13+
<PackageReference Include="ServiceStack.Ormlite" Version="10.*" />
1414
</ItemGroup>
1515

1616
<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: 3 additions & 3 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,8 +16,8 @@
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.*" />
19+
<PackageReference Include="ServiceStack" Version="10.*" />
20+
<PackageReference Include="ServiceStack.Kestrel" Version="10.*" />
2121
</ItemGroup>
2222

2323
</Project>

‎MyApp.sln‎

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

‎MyApp.slnx‎

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

‎MyApp/Configure.OpenApi.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
[assembly: HostingStartup(typeof(MyApp.ConfigureOpenApi))]
1+
using ServiceStack;
2+
3+
[assembly: HostingStartup(typeof(MyApp.ConfigureOpenApi))]
24

35
namespace MyApp;
46

57
public class ConfigureOpenApi : IHostingStartup
68
{
79
public void Configure(IWebHostBuilder builder) => builder
8-
.ConfigureServices((context, services) =>
9-
{
10+
.ConfigureServices((context, services) => {
1011
if (context.HostingEnvironment.IsDevelopment())
1112
{
1213
services.AddEndpointsApiExplorer();
1314
services.AddSwaggerGen();
14-
1515
services.AddServiceStackSwagger();
16-
services.AddBasicAuth<Data.ApplicationUser>();
17-
//services.AddJwtAuth();
18-
19-
services.AddTransient<IStartupFilter, StartupFilter>();
16+
// services.AddBasicAuth<Data.ApplicationUser>();
17+
// services.AddApiKeys();
18+
// services.AddJwtAuth();
19+
20+
services.AddTransient<IStartupFilter,StartupFilter>();
2021
}
2122
});
2223

@@ -29,4 +30,4 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next) =
2930
next(app);
3031
};
3132
}
32-
}
33+
}

‎MyApp/MyApp.csproj‎

Lines changed: 14 additions & 19 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>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>aspnet-MyApp-7b2ab71a-0b50-423f-969d-e35a9402b1b5</UserSecretsId>
@@ -19,27 +19,22 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
23-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.*" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.*" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.*" />
26-
<PackageReference Include="Markdig" Version="0.40.*" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.*" />
31-
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.*" />
32-
<PackageReference Include="ServiceStack.AspNetCore.OpenApi" Version="8.*" />
22+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.*" />
23+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.*" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.*" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.*" />
26+
<PackageReference Include="Markdig" Version="0.44.*" />
3327
</ItemGroup>
3428

3529
<ItemGroup>
36-
<PackageReference Include="ServiceStack" Version="8.*" />
37-
<PackageReference Include="ServiceStack.Blazor" Version="8.*" />
38-
<PackageReference Include="ServiceStack.Mvc" Version="8.*" />
39-
<PackageReference Include="ServiceStack.OrmLite.Sqlite.Data" Version="8.*" />
40-
<PackageReference Include="ServiceStack.Extensions" Version="8.*" />
41-
<PackageReference Include="ServiceStack.Server" Version="8.*" />
42-
<PackageReference Include="ServiceStack.Jobs" Version="8.*" />
30+
<PackageReference Include="ServiceStack" Version="10.*" />
31+
<PackageReference Include="ServiceStack.Blazor" Version="10.*" />
32+
<PackageReference Include="ServiceStack.Mvc" Version="10.*" />
33+
<PackageReference Include="ServiceStack.OpenApi.Swashbuckle" Version="10.*" />
34+
<PackageReference Include="ServiceStack.OrmLite.Sqlite.Data" Version="10.*" />
35+
<PackageReference Include="ServiceStack.Extensions" Version="10.*" />
36+
<PackageReference Include="ServiceStack.Server" Version="10.*" />
37+
<PackageReference Include="ServiceStack.Jobs" Version="10.*" />
4338
</ItemGroup>
4439

4540
<ItemGroup>

‎NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<add key="ServiceStack MyGet feed" value="https://www.myget.org/F/servicestack" />

0 commit comments

Comments
 (0)