Skip to content

Commit

Permalink
Upgraded to ABP v0.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hikalkan
hikalkan committed Jul 19, 2016
1 parent 6d352ac commit ed93f07
Show file tree
Hide file tree
Showing 48 changed files with 1,441 additions and 250 deletions.
23 changes: 13 additions & 10 deletions src/EventCloud.Application/EventCloud.Application.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.10.0.1\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.8.0.1\lib\net461\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.10.0.1\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\Abp.Zero.dll</HintPath>
<Reference Include="Abp.Zero, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Zero.0.10.0.0\lib\net452\Abp.Zero.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
Expand Down Expand Up @@ -73,8 +73,8 @@
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -90,12 +90,15 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Application/Events/Dtos/CreateEventInput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System;
using System.ComponentModel.DataAnnotations;
using Abp.Application.Services.Dto;

namespace EventCloud.Events.Dtos
{
public class CreateEventInput : IInputDto
public class CreateEventInput
{
[Required]
[StringLength(Event.MaxTitleLength)]
Expand Down
2 changes: 1 addition & 1 deletion src/EventCloud.Application/Events/Dtos/EventDetailOutput.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace EventCloud.Events.Dtos
{
[AutoMapFrom(typeof(Event))]
public class EventDetailOutput : FullAuditedEntityDto<Guid>, IOutputDto
public class EventDetailOutput : FullAuditedEntityDto<Guid>
{
public string Title { get; set; }

Expand Down
4 changes: 1 addition & 3 deletions src/EventCloud.Application/Events/Dtos/EventRegisterOutput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Abp.Application.Services.Dto;

namespace EventCloud.Events.Dtos
{
public class EventRegisterOutput : IOutputDto
public class EventRegisterOutput
{
public int RegistrationId { get; set; }
}
Expand Down
6 changes: 2 additions & 4 deletions src/EventCloud.Application/Events/Dtos/GetEventListInput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Abp.Application.Services.Dto;

namespace EventCloud.Events.Dtos
namespace EventCloud.Events.Dtos
{
public class GetEventListInput : IInputDto
public class GetEventListInput
{
public bool IncludeCanceledEvents { get; set; }
}
Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Application/Roles/Dto/UpdateRolePermissionsInput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Abp.Application.Services.Dto;

namespace EventCloud.Roles.Dto
{
public class UpdateRolePermissionsInput : IInputDto
public class UpdateRolePermissionsInput
{
[Range(1, int.MaxValue)]
public int RoleId { get; set; }
Expand Down
6 changes: 2 additions & 4 deletions src/EventCloud.Application/Sessions/Dto/GetCurrentLoginInformationsOutput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Abp.Application.Services.Dto;

namespace EventCloud.Sessions.Dto
namespace EventCloud.Sessions.Dto
{
public class GetCurrentLoginInformationsOutput : IOutputDto
public class GetCurrentLoginInformationsOutput
{
public UserLoginInfoDto User { get; set; }

Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Application/Users/Dto/ProhibitPermissionInput.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Abp.Application.Services.Dto;

namespace EventCloud.Users.Dto
{
public class ProhibitPermissionInput : IInputDto
public class ProhibitPermissionInput
{
[Range(1, long.MaxValue)]
public int UserId { get; set; }
Expand Down
10 changes: 5 additions & 5 deletions src/EventCloud.Application/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.8.0.1" targetFramework="net461" />
<package id="Abp.AutoMapper" version="0.8.0.1" targetFramework="net461" />
<package id="Abp.Zero" version="0.8.0.1" targetFramework="net461" />
<package id="Abp" version="0.10.0.1" targetFramework="net461" />
<package id="Abp.AutoMapper" version="0.10.0.1" targetFramework="net461" />
<package id="Abp.Zero" version="0.10.0.0" targetFramework="net461" />
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
</packages>
3 changes: 1 addition & 2 deletions src/EventCloud.Core/Authorization/Roles/Role.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Abp.Authorization.Roles;
using EventCloud.MultiTenancy;
using EventCloud.Users;

namespace EventCloud.Authorization.Roles
{
public class Role : AbpRole<Tenant, User>
public class Role : AbpRole<User>
{

}
Expand Down
10 changes: 6 additions & 4 deletions src/EventCloud.Core/Authorization/Roles/RoleManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
using Abp.Authorization;
using Abp.Authorization.Roles;
using Abp.Domain.Uow;
using Abp.Runtime.Caching;
using Abp.Zero.Configuration;
using EventCloud.MultiTenancy;
using EventCloud.Users;

namespace EventCloud.Authorization.Roles
{
public class RoleManager : AbpRoleManager<Tenant, Role, User>
public class RoleManager : AbpRoleManager<Role, User>
{
public RoleManager(
RoleStore store,
IPermissionManager permissionManager,
IRoleManagementConfig roleManagementConfig,
ICacheManager cacheManager)
ICacheManager cacheManager,
IUnitOfWorkManager unitOfWorkManager)
: base(
store,
permissionManager,
roleManagementConfig,
cacheManager)
cacheManager,
unitOfWorkManager)
{
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Core/Authorization/Roles/RoleStore.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using Abp.Authorization.Roles;
using Abp.Authorization.Users;
using Abp.Domain.Repositories;
using EventCloud.MultiTenancy;
using EventCloud.Users;

namespace EventCloud.Authorization.Roles
{
public class RoleStore : AbpRoleStore<Tenant, Role, User>
public class RoleStore : AbpRoleStore<Role, User>
{
public RoleStore(
IRepository<Role> roleRepository,
Expand Down
5 changes: 3 additions & 2 deletions src/EventCloud.Core/Editions/EditionManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
using Abp.Application.Editions;
using Abp.Application.Features;
using Abp.Domain.Repositories;
using EventCloud.Features;

namespace EventCloud.Editions
{
public class EditionManager : AbpEditionManager
{
public EditionManager(
IRepository<Edition> editionRepository,
IRepository<EditionFeatureSetting, long> editionFeatureRepository)
FeatureValueStore featureValueStore)
: base(
editionRepository,
editionFeatureRepository)
featureValueStore)
{
}
}
Expand Down
19 changes: 11 additions & 8 deletions src/EventCloud.Core/EventCloud.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.10.0.1\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\Abp.Zero.dll</HintPath>
<Reference Include="Abp.Zero, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Zero.0.10.0.0\lib\net452\Abp.Zero.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
Expand All @@ -65,8 +65,8 @@
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -82,12 +82,15 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
20 changes: 18 additions & 2 deletions src/EventCloud.Core/Features/FeatureValueStore.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
using Abp.Application.Features;
using Abp.Domain.Repositories;
using Abp.Domain.Uow;
using Abp.MultiTenancy;
using Abp.Runtime.Caching;
using EventCloud.Authorization.Roles;
using EventCloud.MultiTenancy;
using EventCloud.Users;
Expand All @@ -7,8 +11,20 @@ namespace EventCloud.Features
{
public class FeatureValueStore : AbpFeatureValueStore<Tenant, Role, User>
{
public FeatureValueStore(TenantManager tenantManager)
: base(tenantManager)
public FeatureValueStore(
ICacheManager cacheManager,
IRepository<TenantFeatureSetting, long> tenantFeatureSettingRepository,
IRepository<Tenant> tenantRepository,
IRepository<EditionFeatureSetting, long> editionFeatureSettingRepository,
IFeatureManager featureManager,
IUnitOfWorkManager unitOfWorkManager)
: base(
cacheManager,
tenantFeatureSettingRepository,
tenantRepository,
editionFeatureSettingRepository,
featureManager,
unitOfWorkManager)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/EventCloud.Core/MultiTenancy/Tenant.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace EventCloud.MultiTenancy
{
public class Tenant : AbpTenant<Tenant, User>
public class Tenant : AbpTenant<User>
{

}
Expand Down
11 changes: 7 additions & 4 deletions src/EventCloud.Core/MultiTenancy/TenantManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Abp.Domain.Repositories;
using Abp.Application.Features;
using Abp.Domain.Repositories;
using Abp.MultiTenancy;
using EventCloud.Authorization.Roles;
using EventCloud.Editions;
Expand All @@ -11,11 +12,13 @@ public class TenantManager : AbpTenantManager<Tenant, Role, User>
public TenantManager(
IRepository<Tenant> tenantRepository,
IRepository<TenantFeatureSetting, long> tenantFeatureRepository,
EditionManager editionManager
EditionManager editionManager,
IAbpZeroFeatureValueStore featureValueStore
) : base(
tenantRepository,
tenantFeatureRepository,
editionManager)
tenantFeatureRepository,
editionManager,
featureValueStore)
{
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Core/Users/User.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using System;
using Abp.Authorization.Users;
using Abp.Extensions;
using EventCloud.MultiTenancy;
using Microsoft.AspNet.Identity;

namespace EventCloud.Users
{
public class User : AbpUser<Tenant, User>
public class User : AbpUser<User>
{
public static string CreateRandomPassword()
{
Expand Down
6 changes: 4 additions & 2 deletions src/EventCloud.Core/Users/UserManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public UserManager(
ICacheManager cacheManager,
IRepository<OrganizationUnit, long> organizationUnitRepository,
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
IOrganizationUnitSettings organizationUnitSettings)
IOrganizationUnitSettings organizationUnitSettings,
IRepository<UserLoginAttempt, long> userLoginAttemptRepository)
: base(
store,
roleManager,
Expand All @@ -42,7 +43,8 @@ public UserManager(
cacheManager,
organizationUnitRepository,
userOrganizationUnitRepository,
organizationUnitSettings
organizationUnitSettings,
userLoginAttemptRepository
)
{
}
Expand Down
3 changes: 1 addition & 2 deletions src/EventCloud.Core/Users/UserStore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
using Abp.Domain.Repositories;
using Abp.Domain.Uow;
using EventCloud.Authorization.Roles;
using EventCloud.MultiTenancy;

namespace EventCloud.Users
{
public class UserStore : AbpUserStore<Tenant, Role, User>
public class UserStore : AbpUserStore<Role, User>
{
public UserStore(
IRepository<User, long> userRepository,
Expand Down
Loading

0 comments on commit ed93f07

Please sign in to comment.