Skip to content

Commit c886bab

Browse files
committed
resolved aspnetboilerplate#5066: Upgrade to ASP.NET Core 3.1 and updated other NuGet packages
1 parent 95bf87a commit c886bab

File tree

153 files changed

+4358
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+4358
-664
lines changed

src/Abp.AspNetCore.OData/Abp.AspNetCore.OData.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<AssemblyName>Abp.AspNetCore.OData</AssemblyName>
99
<PackageId>Abp.AspNetCore.OData</PackageId>
@@ -20,8 +20,8 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<None Include="bin\Release\netcoreapp3.0\Abp.AspNetCore.OData.pdb">
24-
<PackagePath>lib/netcoreapp3.0/</PackagePath>
23+
<None Include="bin\Release\netcoreapp3.1\Abp.AspNetCore.OData.pdb">
24+
<PackagePath>lib/netcoreapp3.1/</PackagePath>
2525
<Pack>true</Pack>
2626
</None>
2727
</ItemGroup>
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.2.1" />
35+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.2.2" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

src/Abp.AspNetCore.SignalR/Abp.AspNetCore.SignalR.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<AssemblyName>Abp.AspNetCore.SignalR</AssemblyName>
99
<PackageId>Abp.AspNetCore.SignalR</PackageId>
@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<None Include="bin\Release\netcoreapp3.0\Abp.AspNetCore.SignalR.pdb">
26-
<PackagePath>lib/netcoreapp3.0/</PackagePath>
25+
<None Include="bin\Release\netcoreapp3.1\Abp.AspNetCore.SignalR.pdb">
26+
<PackagePath>lib/netcoreapp3.1/</PackagePath>
2727
<Pack>true</Pack>
2828
</None>
2929
</ItemGroup>

src/Abp.AspNetCore.TestBase/Abp.AspNetCore.TestBase.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<AssemblyName>Abp.AspNetCore.TestBase</AssemblyName>
99
<PackageId>Abp.AspNetCore.TestBase</PackageId>
@@ -19,8 +19,8 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<None Include="bin\Release\netcoreapp3.0\Abp.AspNetCore.TestBase.pdb">
23-
<PackagePath>lib/netcoreapp3.0/</PackagePath>
22+
<None Include="bin\Release\netcoreapp3.1\Abp.AspNetCore.TestBase.pdb">
23+
<PackagePath>lib/netcoreapp3.1/</PackagePath>
2424
<Pack>true</Pack>
2525
</None>
2626
</ItemGroup>
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
34+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

src/Abp.AspNetCore/Abp.AspNetCore.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<AssemblyName>Abp.AspNetCore</AssemblyName>
99
<PackageId>Abp.AspNetCore</PackageId>
@@ -28,8 +28,8 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<None Include="bin\Release\netcoreapp3.0\Abp.AspNetCore.pdb">
32-
<PackagePath>lib/netcoreapp3.0/</PackagePath>
31+
<None Include="bin\Release\netcoreapp3.1\Abp.AspNetCore.pdb">
32+
<PackagePath>lib/netcoreapp3.1/</PackagePath>
3333
<Pack>true</Pack>
3434
</None>
3535
</ItemGroup>
@@ -41,8 +41,8 @@
4141
<ItemGroup>
4242
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
4343
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
44-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
45-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0"></PackageReference>
44+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
45+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0"></PackageReference>
4646
</ItemGroup>
4747

4848
<ItemGroup>

src/Abp.AspNetCore/AspNetCore/AbpApplicationBuilderExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using Abp.AspNetCore.ExceptionHandling;
1515
using Abp.AspNetCore.Security;
1616
using Abp.AspNetCore.Uow;
17-
using Microsoft.AspNetCore.Hosting;
17+
using Microsoft.Extensions.Hosting;
1818

1919
namespace Abp.AspNetCore
2020
{
@@ -70,7 +70,7 @@ private static void InitializeAbp(IApplicationBuilder app)
7070
var abpBootstrapper = app.ApplicationServices.GetRequiredService<AbpBootstrapper>();
7171
abpBootstrapper.Initialize();
7272

73-
var applicationLifetime = app.ApplicationServices.GetService<IApplicationLifetime>();
73+
var applicationLifetime = app.ApplicationServices.GetService<IHostApplicationLifetime>();
7474
applicationLifetime.ApplicationStopping.Register(() => abpBootstrapper.Dispose());
7575
}
7676

src/Abp.Dapper/Abp.Dapper.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<ItemGroup>
2626
<ProjectReference Include="..\Abp\Abp.csproj" />
27-
<PackageReference Include="Dapper" Version="2.0.4" />
27+
<PackageReference Include="Dapper" Version="2.0.30" />
2828
<Reference Include="System.ComponentModel.DataAnnotations" />
2929
<PackageReference Include="System.Data.Common" Version="4.3.0" />
3030
<PackageReference Include="DapperExtensions.DotnetCore" Version="1.0.1" />

src/Abp.EntityFramework.GraphDiff/Abp.EntityFramework.GraphDiff.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="EntityFramework" Version="6.3.0" />
32+
<PackageReference Include="EntityFramework" Version="6.4.0" />
3333
<PackageReference Include="RefactorThis.GraphDiff" Version="3.1.0" />
3434
</ItemGroup>
3535

src/Abp.EntityFramework/Abp.EntityFramework.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="EntityFramework" Version="6.3.0" />
40-
<PackageReference Include="EntityFramework.DynamicFilters" Version="3.1.0" />
39+
<PackageReference Include="EntityFramework" Version="6.4.0" />
40+
<PackageReference Include="EntityFramework.DynamicFilters" Version="3.1.1" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

src/Abp.EntityFrameworkCore.EFPlus/Abp.EntityFrameworkCore.EFPlus.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.22" />
24+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.24" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

src/Abp.EntityFrameworkCore/Abp.EntityFrameworkCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

0 commit comments

Comments
 (0)