Skip to content

Commit ed93f07

Browse files
hikalkanhikalkan
committed
Upgraded to ABP v0.10.
1 parent 6d352ac commit ed93f07

Some content is hidden

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

48 files changed

+1441
-250
lines changed

‎src/EventCloud.Application/EventCloud.Application.csproj

Lines changed: 13 additions & 10 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.8.0.1, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.10.0.1\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.8.0.1\lib\net461\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.0.10.0.1\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.10.0.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
@@ -73,8 +73,8 @@
7373
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
77-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
76+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -90,12 +90,15 @@
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="System" />
93-
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
93+
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="System.ComponentModel.DataAnnotations" />
98+
<Reference Include="System.Configuration" />
9899
<Reference Include="System.Core" />
100+
<Reference Include="System.Runtime.Caching" />
101+
<Reference Include="System.Transactions" />
99102
<Reference Include="System.Xml.Linq" />
100103
<Reference Include="System.Data.DataSetExtensions" />
101104
<Reference Include="Microsoft.CSharp" />

‎src/EventCloud.Application/Events/Dtos/CreateEventInput.cs

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

54
namespace EventCloud.Events.Dtos
65
{
7-
public class CreateEventInput : IInputDto
6+
public class CreateEventInput
87
{
98
[Required]
109
[StringLength(Event.MaxTitleLength)]

‎src/EventCloud.Application/Events/Dtos/EventDetailOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace EventCloud.Events.Dtos
77
{
88
[AutoMapFrom(typeof(Event))]
9-
public class EventDetailOutput : FullAuditedEntityDto<Guid>, IOutputDto
9+
public class EventDetailOutput : FullAuditedEntityDto<Guid>
1010
{
1111
public string Title { get; set; }
1212

‎src/EventCloud.Application/Events/Dtos/EventRegisterOutput.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using Abp.Application.Services.Dto;
2-
31
namespace EventCloud.Events.Dtos
42
{
5-
public class EventRegisterOutput : IOutputDto
3+
public class EventRegisterOutput
64
{
75
public int RegistrationId { get; set; }
86
}

‎src/EventCloud.Application/Events/Dtos/GetEventListInput.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 EventCloud.Events.Dtos
1+
namespace EventCloud.Events.Dtos
42
{
5-
public class GetEventListInput : IInputDto
3+
public class GetEventListInput
64
{
75
public bool IncludeCanceledEvents { get; set; }
86
}

‎src/EventCloud.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 EventCloud.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/EventCloud.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 EventCloud.Sessions.Dto
1+
namespace EventCloud.Sessions.Dto
42
{
5-
public class GetCurrentLoginInformationsOutput : IOutputDto
3+
public class GetCurrentLoginInformationsOutput
64
{
75
public UserLoginInfoDto User { get; set; }
86

‎src/EventCloud.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 EventCloud.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/EventCloud.Application/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.8.0.1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="0.8.0.1" targetFramework="net461" />
5-
<package id="Abp.Zero" version="0.8.0.1" targetFramework="net461" />
3+
<package id="Abp" version="0.10.0.1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="0.10.0.1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="0.10.0.0" targetFramework="net461" />
66
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
99
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
1010
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
1111
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
12-
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
12+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
1313
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
14-
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
14+
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
1515
</packages>

‎src/EventCloud.Core/Authorization/Roles/Role.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using Abp.Authorization.Roles;
2-
using EventCloud.MultiTenancy;
32
using EventCloud.Users;
43

54
namespace EventCloud.Authorization.Roles
65
{
7-
public class Role : AbpRole<Tenant, User>
6+
public class Role : AbpRole<User>
87
{
98

109
}

‎src/EventCloud.Core/Authorization/Roles/RoleManager.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
using Abp.Authorization;
22
using Abp.Authorization.Roles;
3+
using Abp.Domain.Uow;
34
using Abp.Runtime.Caching;
45
using Abp.Zero.Configuration;
5-
using EventCloud.MultiTenancy;
66
using EventCloud.Users;
77

88
namespace EventCloud.Authorization.Roles
99
{
10-
public class RoleManager : AbpRoleManager<Tenant, Role, User>
10+
public class RoleManager : AbpRoleManager<Role, User>
1111
{
1212
public RoleManager(
1313
RoleStore store,
1414
IPermissionManager permissionManager,
1515
IRoleManagementConfig roleManagementConfig,
16-
ICacheManager cacheManager)
16+
ICacheManager cacheManager,
17+
IUnitOfWorkManager unitOfWorkManager)
1718
: base(
1819
store,
1920
permissionManager,
2021
roleManagementConfig,
21-
cacheManager)
22+
cacheManager,
23+
unitOfWorkManager)
2224
{
2325
}
2426
}

‎src/EventCloud.Core/Authorization/Roles/RoleStore.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using Abp.Authorization.Roles;
22
using Abp.Authorization.Users;
33
using Abp.Domain.Repositories;
4-
using EventCloud.MultiTenancy;
54
using EventCloud.Users;
65

76
namespace EventCloud.Authorization.Roles
87
{
9-
public class RoleStore : AbpRoleStore<Tenant, Role, User>
8+
public class RoleStore : AbpRoleStore<Role, User>
109
{
1110
public RoleStore(
1211
IRepository<Role> roleRepository,

‎src/EventCloud.Core/Editions/EditionManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
using Abp.Application.Editions;
22
using Abp.Application.Features;
33
using Abp.Domain.Repositories;
4+
using EventCloud.Features;
45

56
namespace EventCloud.Editions
67
{
78
public class EditionManager : AbpEditionManager
89
{
910
public EditionManager(
1011
IRepository<Edition> editionRepository,
11-
IRepository<EditionFeatureSetting, long> editionFeatureRepository)
12+
FeatureValueStore featureValueStore)
1213
: base(
1314
editionRepository,
14-
editionFeatureRepository)
15+
featureValueStore)
1516
{
1617
}
1718
}

‎src/EventCloud.Core/EventCloud.Core.csproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.10.0.1\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\Abp.Zero.dll</HintPath>
40+
<Reference Include="Abp.Zero, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.Zero.0.10.0.0\lib\net452\Abp.Zero.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -65,8 +65,8 @@
6565
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
68+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -82,12 +82,15 @@
8282
<Private>True</Private>
8383
</Reference>
8484
<Reference Include="System" />
85-
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86-
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
85+
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System.ComponentModel.DataAnnotations" />
90+
<Reference Include="System.Configuration" />
9091
<Reference Include="System.Core" />
92+
<Reference Include="System.Runtime.Caching" />
93+
<Reference Include="System.Transactions" />
9194
<Reference Include="System.Xml.Linq" />
9295
<Reference Include="System.Data.DataSetExtensions" />
9396
<Reference Include="Microsoft.CSharp" />

‎src/EventCloud.Core/Features/FeatureValueStore.cs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
using Abp.Application.Features;
2+
using Abp.Domain.Repositories;
3+
using Abp.Domain.Uow;
4+
using Abp.MultiTenancy;
5+
using Abp.Runtime.Caching;
26
using EventCloud.Authorization.Roles;
37
using EventCloud.MultiTenancy;
48
using EventCloud.Users;
@@ -7,8 +11,20 @@ namespace EventCloud.Features
711
{
812
public class FeatureValueStore : AbpFeatureValueStore<Tenant, Role, User>
913
{
10-
public FeatureValueStore(TenantManager tenantManager)
11-
: base(tenantManager)
14+
public FeatureValueStore(
15+
ICacheManager cacheManager,
16+
IRepository<TenantFeatureSetting, long> tenantFeatureSettingRepository,
17+
IRepository<Tenant> tenantRepository,
18+
IRepository<EditionFeatureSetting, long> editionFeatureSettingRepository,
19+
IFeatureManager featureManager,
20+
IUnitOfWorkManager unitOfWorkManager)
21+
: base(
22+
cacheManager,
23+
tenantFeatureSettingRepository,
24+
tenantRepository,
25+
editionFeatureSettingRepository,
26+
featureManager,
27+
unitOfWorkManager)
1228
{
1329
}
1430
}

‎src/EventCloud.Core/MultiTenancy/Tenant.cs

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

44
namespace EventCloud.MultiTenancy
55
{
6-
public class Tenant : AbpTenant<Tenant, User>
6+
public class Tenant : AbpTenant<User>
77
{
88

99
}

‎src/EventCloud.Core/MultiTenancy/TenantManager.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Abp.Domain.Repositories;
1+
using Abp.Application.Features;
2+
using Abp.Domain.Repositories;
23
using Abp.MultiTenancy;
34
using EventCloud.Authorization.Roles;
45
using EventCloud.Editions;
@@ -11,11 +12,13 @@ public class TenantManager : AbpTenantManager<Tenant, Role, User>
1112
public TenantManager(
1213
IRepository<Tenant> tenantRepository,
1314
IRepository<TenantFeatureSetting, long> tenantFeatureRepository,
14-
EditionManager editionManager
15+
EditionManager editionManager,
16+
IAbpZeroFeatureValueStore featureValueStore
1517
) : base(
1618
tenantRepository,
17-
tenantFeatureRepository,
18-
editionManager)
19+
tenantFeatureRepository,
20+
editionManager,
21+
featureValueStore)
1922
{
2023
}
2124
}

‎src/EventCloud.Core/Users/User.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System;
22
using Abp.Authorization.Users;
33
using Abp.Extensions;
4-
using EventCloud.MultiTenancy;
54
using Microsoft.AspNet.Identity;
65

76
namespace EventCloud.Users
87
{
9-
public class User : AbpUser<Tenant, User>
8+
public class User : AbpUser<User>
109
{
1110
public static string CreateRandomPassword()
1211
{

‎src/EventCloud.Core/Users/UserManager.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public UserManager(
2828
ICacheManager cacheManager,
2929
IRepository<OrganizationUnit, long> organizationUnitRepository,
3030
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
31-
IOrganizationUnitSettings organizationUnitSettings)
31+
IOrganizationUnitSettings organizationUnitSettings,
32+
IRepository<UserLoginAttempt, long> userLoginAttemptRepository)
3233
: base(
3334
store,
3435
roleManager,
@@ -42,7 +43,8 @@ public UserManager(
4243
cacheManager,
4344
organizationUnitRepository,
4445
userOrganizationUnitRepository,
45-
organizationUnitSettings
46+
organizationUnitSettings,
47+
userLoginAttemptRepository
4648
)
4749
{
4850
}

‎src/EventCloud.Core/Users/UserStore.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
using Abp.Domain.Repositories;
33
using Abp.Domain.Uow;
44
using EventCloud.Authorization.Roles;
5-
using EventCloud.MultiTenancy;
65

76
namespace EventCloud.Users
87
{
9-
public class UserStore : AbpUserStore<Tenant, Role, User>
8+
public class UserStore : AbpUserStore<Role, User>
109
{
1110
public UserStore(
1211
IRepository<User, long> userRepository,

0 commit comments

Comments
 (0)