Skip to content

Commit d0f0adc

Browse files
czhcomczhcom
committed
upgreate .netcore7.0
1 parent 88c6908 commit d0f0adc

File tree

12 files changed

+93
-71
lines changed

12 files changed

+93
-71
lines changed

‎.vs/Dorisoy.Pan/v17/.suo‎

13.5 KB
Binary file not shown.

‎SourceCode/Src/Dorisoy.Pan.API/Dorisoy.Pan.API.csproj‎

Lines changed: 13 additions & 21 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>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<UserSecretsId>59c02045-596a-4f38-9476-40995e33d270</UserSecretsId>
66
</PropertyGroup>
77

@@ -16,26 +16,18 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="AutoMapper" Version="11.0.0" />
20-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
21-
<PackageReference Include="FluentValidation" Version="10.3.6" />
22-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="10.3.6" />
23-
<PackageReference Include="MediatR" Version="9.0.0" />
24-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.13" />
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.13" />
27-
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
28-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.13" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.13">
30-
<PrivateAssets>all</PrivateAssets>
31-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32-
</PackageReference>
33-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
34-
<PackageReference Include="NLog" Version="4.7.13" />
35-
<PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
36-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
37-
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
38-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
19+
<PackageReference Include="AutoMapper" Version="12.0.1" />
20+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
21+
<PackageReference Include="FluentValidation" Version="11.7.0" />
22+
<PackageReference Include="MediatR" Version="12.1.1" />
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.10" />
25+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
26+
<PackageReference Include="NLog" Version="5.2.3" />
27+
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.3" />
28+
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
29+
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
30+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
3931
</ItemGroup>
4032

4133
<ItemGroup>

‎SourceCode/Src/Dorisoy.Pan.API/Helpers/ImageResize.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.IO;
66
using System.Linq;
7+
using ImageInfo = Dorisoy.Pan.Data.ImageInfo;
78

89
namespace Dorisoy.Pan.API.Helpers
910
{

‎SourceCode/Src/Dorisoy.Pan.API/Startup.cs‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
4545
public void ConfigureServices(IServiceCollection services)
4646
{
4747
var assembly = AppDomain.CurrentDomain.Load("Dorisoy.Pan.MediatR");
48-
services.AddMediatR(assembly);
48+
services.AddMediatR(c =>
49+
{
50+
c.RegisterServicesFromAssembly(assembly);
51+
});
52+
4953
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
5054
services.AddValidatorsFromAssemblies(Enumerable.Repeat(assembly, 1));
5155

@@ -216,11 +220,11 @@ public void ConfigureServices(IServiceCollection services)
216220
// c.RootPath = "ClientApp/dist";
217221
//});
218222

219-
services.AddSpaStaticFiles(configuration =>
220-
{
221-
//这里设置路由
222-
configuration.RootPath = "ClientApp";
223-
});
223+
//services.AddSpaStaticFiles(configuration =>
224+
//{
225+
// //这里设置路由
226+
// configuration.RootPath = "ClientApp";
227+
//});
224228

225229

226230
}
@@ -302,20 +306,20 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IWe
302306
app.UseStaticFiles();
303307

304308

305-
//使用spa 静态文件
306-
app.UseSpaStaticFiles();
309+
////使用spa 静态文件
310+
//app.UseSpaStaticFiles();
307311

308312

309313

310-
app.UseSpa(spa =>
311-
{
312-
//这里是angular项目的根目录
313-
spa.Options.SourcePath = "ClientApp";
314-
//if (env.IsDevelopment())
315-
//{
316-
// spa.UseAngularCliServer(npmScript: "start");
317-
//}
318-
});
314+
//app.UseSpa(spa =>
315+
//{
316+
// //这里是angular项目的根目录
317+
// spa.Options.SourcePath = "ClientApp";
318+
// //if (env.IsDevelopment())
319+
// //{
320+
// // spa.UseAngularCliServer(npmScript: "start");
321+
// //}
322+
//});
319323

320324

321325
app.UseCors("ExposeResponseHeaders");

‎SourceCode/Src/Dorisoy.Pan.Common/Dorisoy.Pan.Common.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.13" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
109
</ItemGroup>
1110

1211
<ItemGroup>

‎SourceCode/Src/Dorisoy.Pan.Data/Dorisoy.Pan.Data.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.13" />
8+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
109
</ItemGroup>
1110

1211
</Project>

‎SourceCode/Src/Dorisoy.Pan.Domain/Dorisoy.Pan.Domain.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>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -15,16 +15,16 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.13">
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.13" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.13">
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.3" />
27+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎SourceCode/Src/Dorisoy.Pan.Helper/Dorisoy.Pan.Helper.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<FrameworkReference Include="Microsoft.AspNetCore.App" />
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.13" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
13-
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
12+
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
1413
</ItemGroup>
1514

1615
</Project>

‎SourceCode/Src/Dorisoy.Pan.MediatR/Dorisoy.Pan.MediatR.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<FrameworkReference Include="Microsoft.AspNetCore.App" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AutoMapper" Version="11.0.0" />
13-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
14-
<PackageReference Include="FluentValidation" Version="10.3.6" />
15-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="10.3.6" />
16-
<PackageReference Include="MediatR" Version="9.0.0" />
17-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
12+
<PackageReference Include="AutoMapper" Version="12.0.1" />
13+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
14+
<PackageReference Include="FluentValidation" Version="11.7.0" />
15+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.0" />
16+
<PackageReference Include="MediatR" Version="12.1.1" />
1817
</ItemGroup>
1918

2019
<ItemGroup>

‎SourceCode/Src/Dorisoy.Pan.MediatR/PipeLineBehavior/ValidationBehavior.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@
1010
namespace Dorisoy.Pan.MediatR.PipeLineBehavior
1111
{
1212
public class ValidationBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
13-
where TRequest : IRequest<TResponse>
13+
where TRequest : IRequest<TResponse>
1414
{
1515
private readonly IEnumerable<IValidator<TRequest>> _validators;
1616
public ValidationBehavior(IEnumerable<IValidator<TRequest>> validators)
1717
{
1818
_validators = validators;
1919
}
20-
public async Task<TResponse> Handle(
21-
TRequest request,
22-
CancellationToken cancellationToken,
23-
RequestHandlerDelegate<TResponse> next)
20+
public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
2421
{
2522
var context = new ValidationContext<TRequest>(request);
2623
var failures = _validators

0 commit comments

Comments
 (0)