Skip to content

Commit a83e998

Browse files
hikalkanhikalkan
committed
Upgraded module-zero v0.7.4.1 and angularjs.
1 parent 45bd55d commit a83e998

File tree

50 files changed

+1429
-1174
lines changed

Some content is hidden

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

50 files changed

+1429
-1174
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.4.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.4.0\lib\net451\Abp.Zero.dll</HintPath>
43+
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
44
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
5-
<package id="Abp.Zero" version="0.7.4.0" targetFramework="net451" />
5+
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
66
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.Zero, Version=0.7.4.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.Zero.0.7.4.0\lib\net451\Abp.Zero.dll</HintPath>
39+
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleStore.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Abp.Authorization.Roles;
22
using Abp.Authorization.Users;
33
using Abp.Domain.Repositories;
4-
using Abp.Runtime.Caching;
54
using AbpCompanyName.AbpProjectName.MultiTenancy;
65
using AbpCompanyName.AbpProjectName.Users;
76

@@ -12,13 +11,11 @@ public class RoleStore : AbpRoleStore<Tenant, Role, User>
1211
public RoleStore(
1312
IRepository<Role> roleRepository,
1413
IRepository<UserRole, long> userRoleRepository,
15-
IRepository<RolePermissionSetting, long> rolePermissionSettingRepository,
16-
ICacheManager cacheManager)
14+
IRepository<RolePermissionSetting, long> rolePermissionSettingRepository)
1715
: base(
1816
roleRepository,
1917
userRoleRepository,
20-
rolePermissionSettingRepository,
21-
cacheManager)
18+
rolePermissionSettingRepository)
2219
{
2320
}
2421
}

‎src/AbpCompanyName.AbpProjectName.Core/Editions/EditionManager.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
using Abp.Application.Editions;
2+
using Abp.Application.Features;
3+
using Abp.Domain.Repositories;
24

35
namespace AbpCompanyName.AbpProjectName.Editions
46
{
57
public class EditionManager : AbpEditionManager
68
{
7-
9+
public EditionManager(
10+
IRepository<Edition> editionRepository,
11+
IRepository<EditionFeatureSetting, long> editionFeatureRepository)
12+
: base(
13+
editionRepository,
14+
editionFeatureRepository
15+
)
16+
{
17+
}
818
}
919
}

‎src/AbpCompanyName.AbpProjectName.Core/MultiTenancy/TenantManager.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Abp.MultiTenancy;
1+
using Abp.Domain.Repositories;
2+
using Abp.MultiTenancy;
23
using AbpCompanyName.AbpProjectName.Authorization.Roles;
34
using AbpCompanyName.AbpProjectName.Editions;
45
using AbpCompanyName.AbpProjectName.Users;
@@ -7,10 +8,16 @@ namespace AbpCompanyName.AbpProjectName.MultiTenancy
78
{
89
public class TenantManager : AbpTenantManager<Tenant, Role, User>
910
{
10-
public TenantManager(EditionManager editionManager)
11-
: base(editionManager)
11+
public TenantManager(
12+
IRepository<Tenant> tenantRepository,
13+
IRepository<TenantFeatureSetting, long> tenantFeatureRepository,
14+
EditionManager editionManager)
15+
: base(
16+
tenantRepository,
17+
tenantFeatureRepository,
18+
editionManager
19+
)
1220
{
13-
1421
}
1522
}
1623
}

‎src/AbpCompanyName.AbpProjectName.Core/Users/UserStore.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Abp.Authorization.Users;
22
using Abp.Domain.Repositories;
33
using Abp.Domain.Uow;
4-
using Abp.Runtime.Caching;
54
using AbpCompanyName.AbpProjectName.Authorization.Roles;
65
using AbpCompanyName.AbpProjectName.MultiTenancy;
76

@@ -15,16 +14,14 @@ public UserStore(
1514
IRepository<UserRole, long> userRoleRepository,
1615
IRepository<Role> roleRepository,
1716
IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
18-
IUnitOfWorkManager unitOfWorkManager,
19-
ICacheManager cacheManager)
17+
IUnitOfWorkManager unitOfWorkManager)
2018
: base(
2119
userRepository,
2220
userLoginRepository,
2321
userRoleRepository,
2422
roleRepository,
2523
userPermissionSettingRepository,
26-
unitOfWorkManager,
27-
cacheManager)
24+
unitOfWorkManager)
2825
{
2926
}
3027
}

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4-
<package id="Abp.Zero" version="0.7.4.0" targetFramework="net451" />
4+
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
55
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
<HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.4.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.4.0\lib\net451\Abp.Zero.dll</HintPath>
43+
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.4.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.4.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
47+
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.4.1\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -64,8 +64,8 @@
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
6666
</Reference>
67-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.3\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
67+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<packages>
33
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
44
<package id="Abp.EntityFramework" version="0.7.4.1" targetFramework="net451" />
5-
<package id="Abp.Zero" version="0.7.4.0" targetFramework="net451" />
6-
<package id="Abp.Zero.EntityFramework" version="0.7.4.0" targetFramework="net451" />
5+
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
6+
<package id="Abp.Zero.EntityFramework" version="0.7.4.1" 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" />
11-
<package id="EntityFramework.DynamicFilters" version="1.4.3" targetFramework="net451" />
11+
<package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
1313
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1414
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />

0 commit comments

Comments
 (0)