Skip to content

Commit c0d7f04

Browse files
hikalkanhikalkan
committed
Upgraded to Abp and Abp.Zero v1.0.
1 parent b0ea1f0 commit c0d7f04

File tree

46 files changed

+563
-315
lines changed

Some content is hidden

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

46 files changed

+563
-315
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.12.0.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.1.0.0.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.12.0.0\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.1.0.0.0\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.12.0.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.1.0.0.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="AutoMapper, Version=5.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/Dto/CreateTenantInput.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
using System.ComponentModel.DataAnnotations;
2-
using Abp.Application.Services.Dto;
2+
using Abp.Authorization.Users;
33
using Abp.AutoMapper;
44
using Abp.MultiTenancy;
5-
using AbpCompanyName.AbpProjectName.Users;
65

76
namespace AbpCompanyName.AbpProjectName.MultiTenancy.Dto
87
{
98
[AutoMapTo(typeof(Tenant))]
10-
public class CreateTenantInput : IInputDto
9+
public class CreateTenantInput
1110
{
1211
[Required]
1312
[StringLength(AbpTenantBase.MaxTenancyNameLength)]
@@ -19,7 +18,7 @@ public class CreateTenantInput : IInputDto
1918
public string Name { get; set; }
2019

2120
[Required]
22-
[StringLength(User.MaxEmailAddressLength)]
21+
[StringLength(AbpUserBase.MaxEmailAddressLength)]
2322
public string AdminEmailAddress { get; set; }
2423

2524
[MaxLength(AbpTenantBase.MaxConnectionStringLength)]

‎src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/ITenantAppService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace AbpCompanyName.AbpProjectName.MultiTenancy
77
{
88
public interface ITenantAppService : IApplicationService
99
{
10-
ListResultOutput<TenantListDto> GetTenants();
10+
ListResultDto<TenantListDto> GetTenants();
1111

1212
Task CreateTenant(CreateTenantInput input);
1313
}

‎src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public TenantAppService(
3535
_abpZeroDbMigrator = abpZeroDbMigrator;
3636
}
3737

38-
public ListResultOutput<TenantListDto> GetTenants()
38+
public ListResultDto<TenantListDto> GetTenants()
3939
{
40-
return new ListResultOutput<TenantListDto>(
40+
return new ListResultDto<TenantListDto>(
4141
_tenantManager.Tenants
4242
.OrderBy(t => t.TenancyName)
4343
.ToList()

‎src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/UpdateRolePermissionsInput.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System.Collections.Generic;
22
using System.ComponentModel.DataAnnotations;
3-
using Abp.Application.Services.Dto;
43

54
namespace AbpCompanyName.AbpProjectName.Roles.Dto
65
{
7-
public class UpdateRolePermissionsInput : IInputDto
6+
public class UpdateRolePermissionsInput
87
{
98
[Range(1, int.MaxValue)]
109
public int RoleId { get; set; }

‎src/AbpCompanyName.AbpProjectName.Application/Sessions/Dto/GetCurrentLoginInformationsOutput.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using Abp.Application.Services.Dto;
2-
3-
namespace AbpCompanyName.AbpProjectName.Sessions.Dto
1+
namespace AbpCompanyName.AbpProjectName.Sessions.Dto
42
{
5-
public class GetCurrentLoginInformationsOutput : IOutputDto
3+
public class GetCurrentLoginInformationsOutput
64
{
75
public UserLoginInfoDto User { get; set; }
86

‎src/AbpCompanyName.AbpProjectName.Application/Users/Dto/CreateUserInput.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
using System.ComponentModel.DataAnnotations;
2-
using Abp.Application.Services.Dto;
32
using Abp.Auditing;
43
using Abp.Authorization.Users;
54
using Abp.AutoMapper;
65

76
namespace AbpCompanyName.AbpProjectName.Users.Dto
87
{
98
[AutoMap(typeof(User))]
10-
public class CreateUserInput : IInputDto
9+
public class CreateUserInput
1110
{
1211
[Required]
1312
[StringLength(AbpUserBase.MaxUserNameLength)]

‎src/AbpCompanyName.AbpProjectName.Application/Users/Dto/ProhibitPermissionInput.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using System.ComponentModel.DataAnnotations;
2-
using Abp.Application.Services.Dto;
32

43
namespace AbpCompanyName.AbpProjectName.Users.Dto
54
{
6-
public class ProhibitPermissionInput : IInputDto
5+
public class ProhibitPermissionInput
76
{
87
[Range(1, long.MaxValue)]
98
public int UserId { get; set; }

‎src/AbpCompanyName.AbpProjectName.Application/Users/IUserAppService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public interface IUserAppService : IApplicationService
1111

1212
Task RemoveFromRole(long userId, string roleName);
1313

14-
Task<ListResultOutput<UserListDto>> GetUsers();
14+
Task<ListResultDto<UserListDto>> GetUsers();
1515

1616
Task CreateUser(CreateUserInput input);
1717
}

‎src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public async Task RemoveFromRole(long userId, string roleName)
3737
CheckErrors(await UserManager.RemoveFromRoleAsync(userId, roleName));
3838
}
3939

40-
public async Task<ListResultOutput<UserListDto>> GetUsers()
40+
public async Task<ListResultDto<UserListDto>> GetUsers()
4141
{
4242
var users = await _userRepository.GetAllListAsync();
4343

44-
return new ListResultOutput<UserListDto>(
44+
return new ListResultDto<UserListDto>(
4545
users.MapTo<List<UserListDto>>()
4646
);
4747
}

0 commit comments

Comments
 (0)