Skip to content

Commit f0fb7ae

Browse files
committed
upgraded to .NET 6
1 parent 517c20c commit f0fb7ae

File tree

10 files changed

+37
-33
lines changed

10 files changed

+37
-33
lines changed

aspnet-core/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,7 @@ paket-files/
250250
# JetBrains Rider
251251
.idea/
252252
*.sln.iml
253+
254+
src/AbpCompanyName.AbpProjectName.Web.Mvc/secrets.json
255+
src/AbpCompanyName.AbpProjectName.Web.Host/secrets.json
256+
src/AbpCompanyName.AbpProjectName.Migrator/secrets.json

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

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

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>net5.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>net5.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="6.5.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.5.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="7.0.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="7.0.0" />
2323
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
2424
</ItemGroup>
2525

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.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-
<TargetFrameworks>net5.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
66
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -16,12 +16,12 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj

Lines changed: 2 additions & 2 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>net6.0</TargetFramework>
55
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
66
<AssemblyName>AbpCompanyName.AbpProjectName.Migrator</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="6.5.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>net5.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Core</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Web.Core</PackageId>
@@ -26,11 +26,11 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.10" />
30-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
31-
<PackageReference Include="Abp.AspNetCore" Version="6.5.0" />
32-
<PackageReference Include="Abp.ZeroCore" Version="6.5.0" />
33-
<PackageReference Include="Abp.AspNetCore.SignalR" Version="6.5.0" />
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
30+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
31+
<PackageReference Include="Abp.AspNetCore" Version="7.0.0" />
32+
<PackageReference Include="Abp.ZeroCore" Version="7.0.0" />
33+
<PackageReference Include="Abp.AspNetCore.SignalR" Version="7.0.0" />
3434
</ItemGroup>
3535

3636
</Project>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Host</AssemblyName>
@@ -37,8 +37,8 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Abp.Castle.Log4Net" Version="6.5.0" />
41-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
40+
<PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
41+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4444
</PackageReference>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>AbpCompanyName.AbpProjectName.Web.Mvc</PackageId>
77
<UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
88
<RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
9-
<TargetFramework>net5.0</TargetFramework>
9+
<TargetFramework>net6.0</TargetFramework>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
1111
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1212
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -36,15 +36,15 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
39-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.10" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
39+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
4141
<PrivateAssets>all</PrivateAssets>
4242
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4343
</PackageReference>
4444
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.2" />
45-
<PackageReference Include="Abp.HangFire" Version="6.5.0" />
46-
<PackageReference Include="Abp.RedisCache" Version="6.5.0" />
47-
<PackageReference Include="Abp.Castle.Log4Net" Version="6.5.0" />
45+
<PackageReference Include="Abp.HangFire" Version="7.0.0" />
46+
<PackageReference Include="Abp.RedisCache" Version="7.0.0" />
47+
<PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>net5.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
2222
<PackageReference Include="NSubstitute" Version="4.2.2" />
2323
<PackageReference Include="Shouldly" Version="4.0.3" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
@@ -27,8 +27,8 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="Abp.TestBase" Version="6.5.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10" />
30+
<PackageReference Include="Abp.TestBase" Version="7.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
3232
<PackageReference Include="Castle.Core" Version="4.4.1" />
3333
</ItemGroup>
3434

aspnet-core/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
2222
<PackageReference Include="NSubstitute" Version="4.2.2" />
2323
<PackageReference Include="Shouldly" Version="4.0.3" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
@@ -27,8 +27,8 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="AngleSharp" Version="0.16.0" />
31-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="6.5.0" />
30+
<PackageReference Include="AngleSharp" Version="0.16.1" />
31+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="7.0.0" />
3232
</ItemGroup>
3333

3434
</Project>

0 commit comments

Comments
 (0)