Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3c422e3

Browse files
update projects to .net 8 and update packages to latest version
Modified : src/OA.Domain/OA.Domain.csproj Modified : src/OA.Infrastructure/OA.Infrastructure.csproj Modified : src/OA.Persistence/IdentityContext.cs Modified : src/OA.Persistence/OA.Persistence.csproj Modified : src/OA.Service/OA.Service.csproj Modified : src/OA.Test.Integration/ApiCustomerTest.cs Modified : src/OA.Test.Integration/OA.Test.Integration.csproj Modified : src/OA.Test.Integration/TestClientProvider.cs Modified : src/OA.Test.Unit/OA.Test.Unit.csproj Modified : src/OA.Test.Unit/Persistence/ApplicationDbContextTest.cs Modified : src/OA/Controllers/MetaController.cs Modified : src/OA/OA.csproj Modified : src/OA/Program.cs Modified : src/OA/Properties/launchSettings.json Deleted : src/OA/Startup.cs Modified : src/OA/appsettings.json
1 parent e4c1d43 commit 3c422e3

File tree

16 files changed

+268
-279
lines changed

16 files changed

+268
-279
lines changed

‎src/OA.Domain/OA.Domain.csproj

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

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
68

7-
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
9-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
11+
</ItemGroup>
1012

1113
</Project>
Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
68

7-
<ItemGroup>
8-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
9+
<ItemGroup>
10+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
911

10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
17-
<PackageReference Include="Serilog.AspNetCore" Version="4.0.0" />
18-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
19-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.6.0" />
20-
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
21-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.0" />
22-
23-
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="5.0.2" />
24-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
25-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
26-
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1"/>
27-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.4" />
29-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.4" />
30-
</ItemGroup>
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
19+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
20+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
21+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.0" />
22+
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
23+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
3124

32-
<ItemGroup>
33-
<ProjectReference Include="..\OA.Service\OA.Service.csproj" />
34-
</ItemGroup>
25+
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
26+
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
27+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
28+
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
29+
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
30+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8" />
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<ProjectReference Include="..\OA.Service\OA.Service.csproj" />
36+
</ItemGroup>
3537

3638
</Project>

‎src/OA.Persistence/IdentityContext.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66

77
namespace OA.Persistence
88
{
9-
public class IdentityContext : IdentityDbContext<ApplicationUser>
9+
public class IdentityContext(DbContextOptions<IdentityContext> options)
10+
: IdentityDbContext<ApplicationUser>(options)
1011
{
11-
public IdentityContext(DbContextOptions<IdentityContext> options) : base(options)
12+
13+
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
1214
{
15+
if (!optionsBuilder.IsConfigured)
16+
{
17+
optionsBuilder
18+
.UseSqlServer("DataSource=app.db");
19+
}
20+
1321
}
1422
protected override void OnModelCreating(ModelBuilder modelBuilder)
1523
{
Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
68

7-
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.4" />
9-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" />
10-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.9.0" />
17-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
11+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
19+
</ItemGroup>
1820

19-
<ItemGroup>
20-
<ProjectReference Include="..\OA.Domain\OA.Domain.csproj" />
21-
</ItemGroup>
21+
<ItemGroup>
22+
<ProjectReference Include="..\OA.Domain\OA.Domain.csproj" />
23+
</ItemGroup>
2224

2325
</Project>

‎src/OA.Service/OA.Service.csproj

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
68

7-
<ItemGroup>
8-
<PackageReference Include="AutoMapper" Version="10.1.1" />
9-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
10-
<PackageReference Include="FluentValidation" Version="9.5.3" />
11-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.5.3" />
12-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
13-
<PackageReference Include="MailKit" Version="2.11.1" />
14-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.2.0" />
16-
<PackageReference Include="MimeKit" Version="2.11.0" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
18-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
19-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
11+
<PackageReference Include="FluentValidation" Version="11.10.0" />
12+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
13+
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
14+
<PackageReference Include="MailKit" Version="4.7.1.1" />
15+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
17+
<PackageReference Include="MimeKit" Version="4.7.1" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
20+
</ItemGroup>
2021

21-
<ItemGroup>
22-
<ProjectReference Include="..\OA.Persistence\OA.Persistence.csproj" />
23-
</ItemGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\OA.Persistence\OA.Persistence.csproj" />
24+
</ItemGroup>
2425

2526
</Project>

‎src/OA.Test.Integration/ApiCustomerTest.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using NUnit.Framework;
22
using System.Net;
3-
using System.Net.Http;
4-
using System.Threading.Tasks;
53

64
namespace OA.Test.Integration
75
{
@@ -18,7 +16,7 @@ public async Task GetAllCustomerTestAsync(string method, string URL)
1816

1917
response.EnsureSuccessStatusCode();
2018

21-
Assert.AreEqual(HttpStatusCode.OK,response.StatusCode);
19+
Assert.That(response.StatusCode,Is.EqualTo(HttpStatusCode.OK));
2220
}
2321
}
2422
}
Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
57

6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8+
<IsPackable>false</IsPackable>
9+
<IsTestProject>true</IsTestProject>
10+
</PropertyGroup>
811

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.4" />
11-
<PackageReference Include="nunit" Version="3.13.1" />
12-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
14-
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
14+
<PackageReference Include="nunit" Version="4.2.2" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
17+
</ItemGroup>
1518

16-
<ItemGroup>
17-
<ProjectReference Include="..\OA\OA.csproj" />
18-
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\OA\OA.csproj" />
21+
</ItemGroup>
1922

2023
</Project>
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using Microsoft.AspNetCore.Hosting;
22
using Microsoft.AspNetCore.TestHost;
3-
using System.IO;
4-
using System.Net.Http;
53

64
namespace OA.Test.Integration
75
{
@@ -13,11 +11,9 @@ public TestClientProvider()
1311
{
1412
var server = new TestServer(new WebHostBuilder()
1513
.UseContentRoot(Directory.GetCurrentDirectory())
16-
.UseStartup<Startup>());
14+
.UseStartup<Program>());
1715

1816
Client = server.CreateClient();
19-
20-
2117
}
2218
}
2319
}

‎src/OA.Test.Unit/OA.Test.Unit.csproj

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

3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
57

6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8+
<IsPackable>false</IsPackable>
9+
<IsTestProject>true</IsTestProject>
10+
</PropertyGroup>
811

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
11-
<PackageReference Include="Moq" Version="4.16.1" />
12-
<PackageReference Include="nunit" Version="3.13.1" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
15-
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
14+
<PackageReference Include="Moq" Version="4.20.72" />
15+
<PackageReference Include="nunit" Version="4.2.2" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\OA\OA.csproj" />
22+
</ItemGroup>
1623

17-
<ItemGroup>
18-
<ProjectReference Include="..\OA\OA.csproj" />
19-
</ItemGroup>
20-
2124

2225
</Project>

‎src/OA.Test.Unit/Persistence/ApplicationDbContextTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void CanInsertCustomerIntoDatabasee()
1414
using var context = new ApplicationDbContext();
1515
var customer = new Customer();
1616
context.Customers.Add(customer);
17-
Assert.AreEqual(EntityState.Added,context.Entry(customer).State);
17+
Assert.That(context.Entry(customer).State,Is.EqualTo(EntityState.Added));
1818
}
1919
}
2020
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /