Skip to content

Commit 3b84dda

Browse files
hikalkanhikalkan
committed
Resolved #60: Use Abp.Castle.Log4Net package for logging.
1 parent 24be4c7 commit 3b84dda

File tree

9 files changed

+36
-30
lines changed

9 files changed

+36
-30
lines changed

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<HintPath>..\packages\Abp.AutoMapper.0.11.0.2\lib\net452\Abp.AutoMapper.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53+
<Reference Include="Abp.Castle.Log4Net, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Castle.Log4Net.0.11.0.2\lib\net452\Abp.Castle.Log4Net.dll</HintPath>
55+
<Private>True</Private>
56+
</Reference>
5357
<Reference Include="Abp.EntityFramework, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
5458
<HintPath>..\packages\Abp.EntityFramework.0.11.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
5559
<Private>True</Private>
@@ -110,10 +114,6 @@
110114
<SpecificVersion>False</SpecificVersion>
111115
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
112116
</Reference>
113-
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\packages\Castle.Core-log4net.3.3.3\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
116-
</Reference>
117117
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
118118
<SpecificVersion>False</SpecificVersion>
119119
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
@@ -138,8 +138,8 @@
138138
<HintPath>..\packages\Hangfire.SqlServer.1.6.2\lib\net45\Hangfire.SqlServer.dll</HintPath>
139139
<Private>True</Private>
140140
</Reference>
141-
<Reference Include="log4net">
142-
<HintPath>..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
141+
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
142+
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
143143
<Private>True</Private>
144144
</Reference>
145145
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebMpa/Global.asax.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Abp.Castle.Logging.Log4Net;
23
using Abp.Web;
34
using Castle.Facilities.Logging;
45

@@ -8,7 +9,10 @@ public class MvcApplication : AbpWebApplication<AbpProjectNameWebModule>
89
{
910
protected override void Application_Start(object sender, EventArgs e)
1011
{
11-
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(f => f.UseLog4Net().WithConfig("log4net.config"));
12+
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
13+
f => f.UseAbpLog4Net().WithConfig("log4net.config")
14+
);
15+
1216
base.Application_Start(sender, e);
1317
}
1418
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Abp" version="0.11.0.2" targetFramework="net452" />
44
<package id="Abp.AutoMapper" version="0.11.0.2" targetFramework="net452" />
5+
<package id="Abp.Castle.Log4Net" version="0.11.0.2" targetFramework="net452" />
56
<package id="Abp.EntityFramework" version="0.11.0.2" targetFramework="net452" />
67
<package id="Abp.EntityFramework.Common" version="0.11.0.2" targetFramework="net452" />
78
<package id="Abp.HangFire" version="0.11.0.2" targetFramework="net452" />
@@ -18,10 +19,8 @@
1819
<package id="AutoMapper" version="5.1.1" targetFramework="net452" />
1920
<package id="bootstrap" version="3.3.6" targetFramework="net452" />
2021
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
21-
<package id="Castle.Core-log4net" version="3.3.3" targetFramework="net452" />
2222
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
2323
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
24-
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
2524
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
2625
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
2726
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
@@ -32,7 +31,7 @@
3231
<package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net452" />
3332
<package id="jQuery.Validation" version="1.14.0" targetFramework="net452" />
3433
<package id="json2" version="1.0.2" targetFramework="net452" />
35-
<package id="log4net" version="1.2.10" targetFramework="net452" />
34+
<package id="log4net" version="2.0.5" targetFramework="net452" />
3635
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
3736
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
3837
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<HintPath>..\packages\Abp.AutoMapper.0.11.0.2\lib\net452\Abp.AutoMapper.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53+
<Reference Include="Abp.Castle.Log4Net, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Castle.Log4Net.0.11.0.2\lib\net452\Abp.Castle.Log4Net.dll</HintPath>
55+
<Private>True</Private>
56+
</Reference>
5357
<Reference Include="Abp.EntityFramework, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
5458
<HintPath>..\packages\Abp.EntityFramework.0.11.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
5559
<Private>True</Private>
@@ -108,10 +112,6 @@
108112
<Reference Include="Castle.Facilities.Logging">
109113
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
110114
</Reference>
111-
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
112-
<SpecificVersion>False</SpecificVersion>
113-
<HintPath>..\packages\Castle.Core-log4net.3.3.3\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
114-
</Reference>
115115
<Reference Include="Castle.Windsor">
116116
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
117117
</Reference>
@@ -135,8 +135,8 @@
135135
<HintPath>..\packages\Hangfire.SqlServer.1.6.2\lib\net45\Hangfire.SqlServer.dll</HintPath>
136136
<Private>True</Private>
137137
</Reference>
138-
<Reference Include="log4net">
139-
<HintPath>..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
138+
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
139+
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
140140
<Private>True</Private>
141141
</Reference>
142142
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Global.asax.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Abp.Castle.Logging.Log4Net;
23
using Abp.Web;
34
using Castle.Facilities.Logging;
45

@@ -8,7 +9,10 @@ public class MvcApplication : AbpWebApplication<AbpProjectNameWebModule>
89
{
910
protected override void Application_Start(object sender, EventArgs e)
1011
{
11-
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(f => f.UseLog4Net().WithConfig("log4net.config"));
12+
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
13+
f => f.UseAbpLog4Net().WithConfig("log4net.config")
14+
);
15+
1216
base.Application_Start(sender, e);
1317
}
1418
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Abp" version="0.11.0.2" targetFramework="net452" />
44
<package id="Abp.AutoMapper" version="0.11.0.2" targetFramework="net452" />
5+
<package id="Abp.Castle.Log4Net" version="0.11.0.2" targetFramework="net452" />
56
<package id="Abp.EntityFramework" version="0.11.0.2" targetFramework="net452" />
67
<package id="Abp.EntityFramework.Common" version="0.11.0.2" targetFramework="net452" />
78
<package id="Abp.HangFire" version="0.11.0.2" targetFramework="net452" />
@@ -22,10 +23,8 @@
2223
<package id="AutoMapper" version="5.1.1" targetFramework="net452" />
2324
<package id="bootstrap" version="3.3.6" targetFramework="net452" />
2425
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
25-
<package id="Castle.Core-log4net" version="3.3.3" targetFramework="net452" />
2626
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
2727
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
28-
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
2928
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
3029
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
3130
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
@@ -36,7 +35,7 @@
3635
<package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net452" />
3736
<package id="jQuery.Validation" version="1.14.0" targetFramework="net452" />
3837
<package id="json2" version="1.0.2" targetFramework="net452" />
39-
<package id="log4net" version="1.2.10" targetFramework="net452" />
38+
<package id="log4net" version="2.0.5" targetFramework="net452" />
4039
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
4140
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
4241
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />

‎src/Tools/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<HintPath>..\..\packages\Abp.0.11.0.2\lib\net452\Abp.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41+
<Reference Include="Abp.Castle.Log4Net, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Abp.Castle.Log4Net.0.11.0.2\lib\net452\Abp.Castle.Log4Net.dll</HintPath>
43+
<Private>True</Private>
44+
</Reference>
4145
<Reference Include="Abp.EntityFramework, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
4246
<HintPath>..\..\packages\Abp.EntityFramework.0.11.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
4347
<Private>True</Private>
@@ -62,10 +66,6 @@
6266
<HintPath>..\..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
6367
<Private>True</Private>
6468
</Reference>
65-
<Reference Include="Castle.Services.Logging.Log4netIntegration, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Castle.Core-log4net.3.3.3\lib\net45\Castle.Services.Logging.Log4netIntegration.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
6969
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
7070
<HintPath>..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
7171
<Private>True</Private>
@@ -82,8 +82,8 @@
8282
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
85-
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
85+
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
86+
<HintPath>..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Tools/AbpCompanyName.AbpProjectName.Migrator/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using Abp;
3+
using Abp.Castle.Logging.Log4Net;
34
using Abp.Collections.Extensions;
45
using Abp.Dependency;
56
using Castle.Facilities.Logging;
@@ -17,7 +18,7 @@ public static void Main(string[] args)
1718
using (var bootstrapper = AbpBootstrapper.Create<AbpProjectNameMigratorModule>())
1819
{
1920
bootstrapper.IocManager.IocContainer
20-
.AddFacility<LoggingFacility>(f => f.UseLog4Net()
21+
.AddFacility<LoggingFacility>(f => f.UseAbpLog4Net()
2122
.WithConfig("log4net.config")
2223
);
2324

‎src/Tools/AbpCompanyName.AbpProjectName.Migrator/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Abp" version="0.11.0.2" targetFramework="net452" />
4+
<package id="Abp.Castle.Log4Net" version="0.11.0.2" targetFramework="net452" />
45
<package id="Abp.EntityFramework" version="0.11.0.2" targetFramework="net452" />
56
<package id="Abp.EntityFramework.Common" version="0.11.0.2" targetFramework="net452" />
67
<package id="Abp.Zero" version="0.11.0.0" targetFramework="net452" />
78
<package id="Abp.Zero.EntityFramework" version="0.11.0.0" targetFramework="net452" />
89
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
9-
<package id="Castle.Core-log4net" version="3.3.3" targetFramework="net452" />
1010
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
1111
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
12-
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
1312
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
1413
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
15-
<package id="log4net" version="1.2.10" targetFramework="net452" />
14+
<package id="log4net" version="2.0.5" targetFramework="net452" />
1615
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1716
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1817
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />

0 commit comments

Comments
 (0)