Skip to content

Commit b6a65e0

Browse files
authored
Merge pull request #127 from fretje/master
Newlines / ordering of using statements / consistency
2 parents 74ef645 + 29ed20e commit b6a65e0

File tree

121 files changed

+291
-389
lines changed

Some content is hidden

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

121 files changed

+291
-389
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System;
22
using System.Threading.Tasks;
3+
using Microsoft.AspNetCore.Identity;
34
using Abp.Application.Services;
4-
using AbpCompanyName.AbpProjectName.MultiTenancy;
5-
using Abp.Runtime.Session;
65
using Abp.IdentityFramework;
6+
using Abp.Runtime.Session;
7+
using AbpCompanyName.AbpProjectName.MultiTenancy;
78
using AbpCompanyName.AbpProjectName.Authorization.Users;
8-
using Microsoft.AspNetCore.Identity;
99

1010
namespace AbpCompanyName.AbpProjectName
1111
{
@@ -44,4 +44,4 @@ protected virtual void CheckErrors(IdentityResult identityResult)
4444
identityResult.CheckErrors(LocalizationManager);
4545
}
4646
}
47-
}
47+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Reflection;
2-
using Abp.AutoMapper;
1+
using Abp.AutoMapper;
32
using Abp.Modules;
43
using Abp.Reflection.Extensions;
54
using AbpCompanyName.AbpProjectName.Authorization;
@@ -18,14 +17,15 @@ public override void PreInitialize()
1817

1918
public override void Initialize()
2019
{
21-
Assembly thisAssembly = typeof(AbpProjectNameApplicationModule).GetAssembly();
20+
var thisAssembly = typeof(AbpProjectNameApplicationModule).GetAssembly();
21+
2222
IocManager.RegisterAssemblyByConvention(thisAssembly);
2323

2424
Configuration.Modules.AbpAutoMapper().Configurators.Add(cfg =>
2525
{
26-
//Scan the assembly for classes which inherit from AutoMapper.Profile
26+
// Scan the assembly for classes which inherit from AutoMapper.Profile
2727
cfg.AddProfiles(thisAssembly);
2828
});
2929
}
3030
}
31-
}
31+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/AbpLoginResultTypeHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Exception CreateExceptionForFailedLoginAttempt(AbpLoginResultType result,
3232
return new UserFriendlyException(L("LoginFailed"), L("UserEmailIsNotConfirmedAndCanNotLogin"));
3333
case AbpLoginResultType.LockedOut:
3434
return new UserFriendlyException(L("LoginFailed"), L("UserLockedOutMessage"));
35-
default: //Can not fall to default actually. But other result types can be added in the future and we may forget to handle it
35+
default: // Can not fall to default actually. But other result types can be added in the future and we may forget to handle it
3636
Logger.Warn("Unhandled login fail reason: " + result);
3737
return new UserFriendlyException(L("LoginFailed"));
3838
}
@@ -55,7 +55,7 @@ public string CreateLocalizedMessageForFailedLoginAttempt(AbpLoginResultType res
5555
return L("UserIsNotActiveAndCanNotLogin", usernameOrEmailAddress);
5656
case AbpLoginResultType.UserEmailIsNotConfirmed:
5757
return L("UserEmailIsNotConfirmedAndCanNotLogin");
58-
default: //Can not fall to default actually. But other result types can be added in the future and we may forget to handle it
58+
default: // Can not fall to default actually. But other result types can be added in the future and we may forget to handle it
5959
Logger.Warn("Unhandled login fail reason: " + result);
6060
return L("LoginFailed");
6161
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/AccountAppService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ public async Task<RegisterOutput> Register(RegisterInput input)
5151
};
5252
}
5353
}
54-
}
54+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/IsTenantAvailableInput.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
66
public class IsTenantAvailableInput
77
{
88
[Required]
9-
[MaxLength(AbpTenantBase.MaxTenancyNameLength)]
9+
[StringLength(AbpTenantBase.MaxTenancyNameLength)]
1010
public string TenancyName { get; set; }
1111
}
1212
}
13-

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/IsTenantAvailableOutput.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public class IsTenantAvailableOutput
88

99
public IsTenantAvailableOutput()
1010
{
11-
1211
}
1312

1413
public IsTenantAvailableOutput(TenantAvailabilityState state, int? tenantId = null)
@@ -17,4 +16,4 @@ public IsTenantAvailableOutput(TenantAvailabilityState state, int? tenantId = nu
1716
TenantId = tenantId;
1817
}
1918
}
20-
}
19+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/RegisterInput.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
using System.ComponentModel.DataAnnotations;
33
using Abp.Auditing;
44
using Abp.Authorization.Users;
5-
using AbpCompanyName.AbpProjectName.Authorization.Users;
6-
using AbpCompanyName.AbpProjectName.Validation;
75
using Abp.Extensions;
6+
using AbpCompanyName.AbpProjectName.Validation;
87

98
namespace AbpCompanyName.AbpProjectName.Authorization.Accounts.Dto
109
{
1110
public class RegisterInput : IValidatableObject
1211
{
1312
[Required]
14-
[StringLength(User.MaxNameLength)]
13+
[StringLength(AbpUserBase.MaxNameLength)]
1514
public string Name { get; set; }
1615

1716
[Required]
18-
[StringLength(User.MaxSurnameLength)]
17+
[StringLength(AbpUserBase.MaxSurnameLength)]
1918
public string Surname { get; set; }
2019

2120
[Required]
@@ -28,7 +27,7 @@ public class RegisterInput : IValidatableObject
2827
public string EmailAddress { get; set; }
2928

3029
[Required]
31-
[StringLength(User.MaxPlainPasswordLength)]
30+
[StringLength(AbpUserBase.MaxPlainPasswordLength)]
3231
[DisableAuditing]
3332
public string Password { get; set; }
3433

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/RegisterOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ public class RegisterOutput
44
{
55
public bool CanLogin { get; set; }
66
}
7-
}
7+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/TenantAvailabilityState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ public enum TenantAvailabilityState
66
InActive,
77
NotFound
88
}
9-
}
9+
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Configuration/Dto/ChangeUiThemeInput.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace AbpCompanyName.AbpProjectName.Configuration.Dto
55
public class ChangeUiThemeInput
66
{
77
[Required]
8-
[MaxLength(32)]
8+
[StringLength(32)]
99
public string Theme { get; set; }
1010
}
11-
}
11+
}

0 commit comments

Comments
 (0)