Skip to content

Commit 46c18e6

Browse files
hikalkanhikalkan
committed
Upgraded to latest ABP.
1 parent 9223182 commit 46c18e6

File tree

811 files changed

+77473
-17137
lines changed

Some content is hidden

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

811 files changed

+77473
-17137
lines changed

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Application/MySpaProject.Application.csproj

Lines changed: 3 additions & 7 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,7 +44,7 @@
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>

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Application/MySpaProjectApplicationModule.cs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
using System;
2-
using System.Reflection;
3-
using Abp.Dependency;
1+
using System.Reflection;
42
using Abp.Modules;
5-
using Abp.Startup;
6-
using Abp.Startup.Application;
73

84
namespace MySpaProject
95
{
6+
[DependsOn(typeof(MySpaProjectCoreModule))]
107
public class MySpaProjectApplicationModule : AbpModule
118
{
12-
public override Type[] GetDependedModules()
9+
public override void Initialize()
1310
{
14-
return new[]
15-
{
16-
typeof(AbpApplicationModule),
17-
typeof(MySpaProjectCoreModule)
18-
};
19-
}
20-
21-
public override void Initialize(IAbpInitializationContext initializationContext)
22-
{
23-
base.Initialize(initializationContext);
24-
IocManager.Instance.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
11+
IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
2512
}
2613
}
2714
}

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Application/packages.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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="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" />
5+
<package id="Castle.Core" version="3.3.1" targetFramework="net451" />
76
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
87
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
98
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Core/MySpaProject.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
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>

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Core/MySpaProjectCoreModule.cs

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

64
namespace MySpaProject
75
{
86
public class MySpaProjectCoreModule : AbpModule
97
{
10-
public override void Initialize(IAbpInitializationContext initializationContext)
8+
public override void Initialize()
119
{
12-
base.Initialize(initializationContext);
13-
IocManager.Instance.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
10+
IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
1411
}
1512
}
1613
}

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Core/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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" />
3+
<package id="Abp" version="0.3.2.12" targetFramework="net451" />
4+
<package id="Castle.Core" version="3.3.1" targetFramework="net451" />
55
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
66
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
77
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.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>

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Infrastructure.EntityFramework/EntityFramework/MySpaProjectDbContext.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

44
namespace MySpaProject.EntityFramework
55
{

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Infrastructure.EntityFramework/EntityFramework/Repositories/MySpaProjectRepositoryBase.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using Abp.Domain.Entities;
6-
using Abp.Domain.Repositories.EntityFramework;
1+
using Abp.Domain.Entities;
2+
using Abp.EntityFramework.Repositories;
73

84
namespace MySpaProject.EntityFramework.Repositories
95
{

‎Templates/All-In-One-Template/MySpaProject/MySpaProject.Infrastructure.EntityFramework/MySpaProject.Infrastructure.EntityFramework.csproj

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,27 @@
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>
44-
<Reference Include="Castle.Facilities.Logging">
44+
<Reference Include="Castle.Facilities.Logging, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
4546
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
4647
</Reference>
47-
<Reference Include="Castle.Windsor">
48+
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
49+
<SpecificVersion>False</SpecificVersion>
4850
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
4951
</Reference>
50-
<Reference Include="Dynamic">
52+
<Reference Include="Dynamic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=68293a411f0cabcc, processorArchitecture=MSIL">
53+
<SpecificVersion>False</SpecificVersion>
5154
<HintPath>..\packages\DynamicQuery.1.0\lib\35\Dynamic.dll</HintPath>
5255
</Reference>
5356
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -59,7 +62,8 @@
5962
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
6063
</Reference>
6164
<Reference Include="System" />
62-
<Reference Include="System.Collections.Immutable">
65+
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
6367
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
6468
</Reference>
6569
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -80,15 +84,15 @@
8084
<None Include="App.config" />
8185
<None Include="packages.config" />
8286
</ItemGroup>
83-
<ItemGroup>
84-
<Content Include="Dynamic Expressions.html" />
85-
</ItemGroup>
8687
<ItemGroup>
8788
<ProjectReference Include="..\MySpaProject.Core\MySpaProject.Core.csproj">
8889
<Project>{17298EA0-AF73-4F30-B6F1-2066100D7D74}</Project>
8990
<Name>MySpaProject.Core</Name>
9091
</ProjectReference>
9192
</ItemGroup>
93+
<ItemGroup>
94+
<Content Include="Dynamic Expressions.html" />
95+
</ItemGroup>
9296
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9397
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9498
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)