Skip to content

Commit 46604f4

Browse files
hikalkanhikalkan
committed
Adapting to ABP latest ABP.
1 parent 03034e6 commit 46604f4

File tree

806 files changed

+77500
-17087
lines changed

Some content is hidden

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

806 files changed

+77500
-17087
lines changed

‎SimpleTaskSystem/SimpleTaskSystem.Application/SimpleTaskSystem.Application.csproj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,9 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Abp, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
33+
<Reference Include="Abp, Version=0.3.2.12, Culture=neutral, processorArchitecture=MSIL">
3434
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\packages\Abp.0.3.2.0\lib\net451\Abp.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Abp.Application, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\Abp.Application.0.3.2.0\lib\net451\Abp.Application.dll</HintPath>
35+
<HintPath>..\packages\Abp.0.3.2.12\lib\net451\Abp.dll</HintPath>
4036
</Reference>
4137
<Reference Include="AutoMapper, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4238
<SpecificVersion>False</SpecificVersion>
@@ -48,14 +44,15 @@
4844
</Reference>
4945
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5046
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
47+
<HintPath>..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
5248
</Reference>
5349
<Reference Include="Castle.Facilities.Logging, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5450
<SpecificVersion>False</SpecificVersion>
5551
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5652
</Reference>
57-
<Reference Include="Castle.Services.Logging.Log4netIntegration">
58-
<HintPath>..\packages\Castle.Core-log4net.3.3.0\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
53+
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\packages\Castle.Core-log4net.3.3.1\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
5956
</Reference>
6057
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6158
<SpecificVersion>False</SpecificVersion>

‎SimpleTaskSystem/SimpleTaskSystem.Application/SimpleTaskSystemApplicationModule.cs

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
1-
using System;
2-
using System.Reflection;
3-
using Abp.Dependency;
1+
using System.Reflection;
42
using Abp.Modules;
5-
using Abp.Startup;
63

74
namespace SimpleTaskSystem
85
{
96
/// <summary>
107
/// 'Aplication layer module' for this project.
118
/// </summary>
9+
[DependsOn(typeof(SimpleTaskSystemCoreModule))]
1210
public class SimpleTaskSystemApplicationModule : AbpModule
1311
{
14-
/// <summary>
15-
/// We declare depended modules explicitly.
16-
/// </summary>
17-
public override Type[] GetDependedModules()
12+
public override void Initialize()
1813
{
19-
return new[]
20-
{
21-
typeof(SimpleTaskSystemCoreModule)
22-
};
23-
}
24-
25-
public override void Initialize(IAbpInitializationContext initializationContext)
26-
{
27-
base.Initialize(initializationContext);
28-
2914
//This code is used to register classes to dependency injection system for this assembly using conventions.
30-
IocManager.Instance.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
15+
IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
3116

3217
//We must declare mappings to be able to use AutoMapper
3318
DtoMappings.Map();

‎SimpleTaskSystem/SimpleTaskSystem.Application/packages.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.3.2.0" targetFramework="net451" />
4-
<package id="Abp.Application" version="0.3.2.0" targetFramework="net451" />
3+
<package id="Abp" version="0.3.2.12" targetFramework="net451" />
54
<package id="AutoMapper" version="3.2.1" targetFramework="net451" />
6-
<package id="Castle.Core" version="3.3.0" targetFramework="net451" />
7-
<package id="Castle.Core-log4net" version="3.3.0" targetFramework="net451" />
5+
<package id="Castle.Core" version="3.3.1" targetFramework="net451" />
6+
<package id="Castle.Core-log4net" version="3.3.1" targetFramework="net451" />
87
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
98
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
109
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net451" />

‎SimpleTaskSystem/SimpleTaskSystem.Core/SimpleTaskSystem.Core.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,21 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Abp, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
33+
<Reference Include="Abp, Version=0.3.2.12, Culture=neutral, processorArchitecture=MSIL">
3434
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\packages\Abp.0.3.2.0\lib\net451\Abp.dll</HintPath>
35+
<HintPath>..\packages\Abp.0.3.2.12\lib\net451\Abp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
39+
<HintPath>..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Castle.Facilities.Logging, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
4343
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Castle.Services.Logging.Log4netIntegration">
46-
<HintPath>..\packages\Castle.Core-log4net.3.3.0\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
45+
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\packages\Castle.Core-log4net.3.3.1\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
4748
</Reference>
4849
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4950
<SpecificVersion>False</SpecificVersion>

‎SimpleTaskSystem/SimpleTaskSystem.Core/SimpleTaskSystemCoreModule.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
2-
using Abp.Dependency;
32
using Abp.Modules;
4-
using Abp.Startup;
53

64
namespace SimpleTaskSystem
75
{
@@ -10,12 +8,10 @@ namespace SimpleTaskSystem
108
/// </summary>
119
public class SimpleTaskSystemCoreModule : AbpModule
1210
{
13-
public override void Initialize(IAbpInitializationContext initializationContext)
11+
public override void Initialize()
1412
{
15-
base.Initialize(initializationContext);
16-
1713
//This code is used to register classes to dependency injection system for this assembly using conventions.
18-
IocManager.Instance.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
14+
IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
1915
}
2016
}
2117
}

‎SimpleTaskSystem/SimpleTaskSystem.Core/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.3.2.0" targetFramework="net451" />
4-
<package id="Castle.Core" version="3.3.0" targetFramework="net451" />
5-
<package id="Castle.Core-log4net" version="3.3.0" targetFramework="net451" />
3+
<package id="Abp" version="0.3.2.12" targetFramework="net451" />
4+
<package id="Castle.Core" version="3.3.1" targetFramework="net451" />
5+
<package id="Castle.Core-log4net" version="3.3.1" targetFramework="net451" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
88
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net451" />

‎SimpleTaskSystem/SimpleTaskSystem.Infrastructure.EntityFramework/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<configSections>
44
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5-
</configSections>
5+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
66
<entityFramework>
77
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
88
<providers>

‎SimpleTaskSystem/SimpleTaskSystem.Infrastructure.EntityFramework/EntityFramework/Repositories/SimpleTaskSystemRepositoryBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Abp.Domain.Entities;
2-
using Abp.Domain.Repositories.EntityFramework;
2+
using Abp.EntityFramework.Repositories;
33

44
namespace SimpleTaskSystem.EntityFramework.Repositories
55
{

‎SimpleTaskSystem/SimpleTaskSystem.Infrastructure.EntityFramework/EntityFramework/SimpleTaskSystemDbContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Data.Entity;
2-
using Abp.Domain.Repositories.EntityFramework;
2+
using Abp.EntityFramework;
33
using SimpleTaskSystem.People;
44
using SimpleTaskSystem.Tasks;
55

‎SimpleTaskSystem/SimpleTaskSystem.Infrastructure.EntityFramework/SimpleTaskSystem.Infrastructure.EntityFramework.csproj

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,29 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Abp, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
33+
<Reference Include="Abp, Version=0.3.2.12, Culture=neutral, processorArchitecture=MSIL">
3434
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\packages\Abp.0.3.2.0\lib\net451\Abp.dll</HintPath>
35+
<HintPath>..\packages\Abp.0.3.2.12\lib\net451\Abp.dll</HintPath>
3636
</Reference>
37-
<Reference Include="Abp.Infrastructure.EntityFramework, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\Abp.Infrastructure.EntityFramework.0.3.2.0\lib\net451\Abp.Infrastructure.EntityFramework.dll</HintPath>
37+
<Reference Include="Abp.EntityFramework">
38+
<HintPath>..\packages\Abp.EntityFramework.0.3.2.12\lib\net451\Abp.EntityFramework.dll</HintPath>
4039
</Reference>
41-
<Reference Include="Castle.Core">
42-
<HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
40+
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Castle.Facilities.Logging">
4545
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Castle.Services.Logging.Log4netIntegration">
48-
<HintPath>..\packages\Castle.Core-log4net.3.3.0\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
47+
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
48+
<SpecificVersion>False</SpecificVersion>
49+
<HintPath>..\packages\Castle.Core-log4net.3.3.1\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
4950
</Reference>
5051
<Reference Include="Castle.Windsor">
5152
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
5253
</Reference>
53-
<Reference Include="Dynamic">
54+
<Reference Include="Dynamic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=68293a411f0cabcc, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
5456
<HintPath>..\packages\DynamicQuery.1.0\lib\35\Dynamic.dll</HintPath>
5557
</Reference>
5658
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -65,7 +67,8 @@
6567
<HintPath>..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
6668
</Reference>
6769
<Reference Include="System" />
68-
<Reference Include="System.Collections.Immutable">
70+
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
6972
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
7073
</Reference>
7174
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -94,9 +97,6 @@
9497
<None Include="packages.config" />
9598
<None Include="README.md" />
9699
</ItemGroup>
97-
<ItemGroup>
98-
<Content Include="Dynamic Expressions.html" />
99-
</ItemGroup>
100100
<ItemGroup>
101101
<ProjectReference Include="..\SimpleTaskSystem.Core\SimpleTaskSystem.Core.csproj">
102102
<Project>{17298EA0-AF73-4F30-B6F1-2066100D7D74}</Project>
@@ -108,6 +108,9 @@
108108
<DependentUpon>201406291022389_InitialCreate.cs</DependentUpon>
109109
</EmbeddedResource>
110110
</ItemGroup>
111+
<ItemGroup>
112+
<Content Include="Dynamic Expressions.html" />
113+
</ItemGroup>
111114
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112115
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
113116
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)