Skip to content

Commit 84b8110

Browse files
ismcagdasismcagdas
authored
Merge pull request #566 from aspnetboilerplate/upgrade-to-abp-6-0
Upgrade to abp 6 0
2 parents 3026f1e + 194cc80 commit 84b8110

File tree

14 files changed

+2290
-256
lines changed

14 files changed

+2290
-256
lines changed

‎aspnet-core/AbpCompanyName.AbpProjectName.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30709.64
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}"
77
EndProject
@@ -21,9 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCompanyName.AbpProjectNa
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCompanyName.AbpProjectName.Web.Mvc", "src\AbpCompanyName.AbpProjectName.Web.Mvc\AbpCompanyName.AbpProjectName.Web.Mvc.csproj", "{A2213374-BB48-48FD-BBD4-81E6A961D866}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbpCompanyName.AbpProjectName.Web.Tests", "test\AbpCompanyName.AbpProjectName.Web.Tests\AbpCompanyName.AbpProjectName.Web.Tests.csproj", "{CA86CF6F-5D9E-4DAC-9CCB-0F87B519E087}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCompanyName.AbpProjectName.Web.Tests", "test\AbpCompanyName.AbpProjectName.Web.Tests\AbpCompanyName.AbpProjectName.Web.Tests.csproj", "{CA86CF6F-5D9E-4DAC-9CCB-0F87B519E087}"
2727
EndProject
2828
Global
2929
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -82,4 +82,7 @@ Global
8282
{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
8383
{CA86CF6F-5D9E-4DAC-9CCB-0F87B519E087} = {F10AA149-2626-486E-85BB-9CD5365F3016}
8484
EndGlobalSection
85+
GlobalSection(ExtensibilityGlobals) = postSolution
86+
SolutionGuid = {9A55C749-0BFF-4EFD-8499-12A2CB3B5B07}
87+
EndGlobalSection
8588
EndGlobal

‎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>netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net5.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>netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net5.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="5.13.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.13.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="6.0.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.0.0" />
2323
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
2424
</ItemGroup>
2525

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserStore.cs‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,22 @@ public UserStore(
1313
IUnitOfWorkManager unitOfWorkManager,
1414
IRepository<User, long> userRepository,
1515
IRepository<Role> roleRepository,
16-
IAsyncQueryableExecuter asyncQueryableExecuter,
1716
IRepository<UserRole, long> userRoleRepository,
1817
IRepository<UserLogin, long> userLoginRepository,
1918
IRepository<UserClaim, long> userClaimRepository,
2019
IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
2120
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
22-
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
23-
: base(
24-
unitOfWorkManager,
25-
userRepository,
26-
roleRepository,
27-
asyncQueryableExecuter,
28-
userRoleRepository,
29-
userLoginRepository,
30-
userClaimRepository,
31-
userPermissionSettingRepository,
32-
userOrganizationUnitRepository,
33-
organizationUnitRoleRepository)
21+
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
22+
: base(unitOfWorkManager,
23+
userRepository,
24+
roleRepository,
25+
userRoleRepository,
26+
userLoginRepository,
27+
userClaimRepository,
28+
userPermissionSettingRepository,
29+
userOrganizationUnitRepository,
30+
organizationUnitRoleRepository
31+
)
3432
{
3533
}
3634
}

‎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>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.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="3.1.4" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.4">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.4">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

0 commit comments

Comments
 (0)