Skip to content

Commit 3f86be8

Browse files
bencartbencart
authored
Merge pull request #8 from nsip/develop
Develop
2 parents 5b558fb + 3f1f43a commit 3f86be8

86 files changed

Lines changed: 1152 additions & 984 deletions

File tree

Some content is hidden

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

‎Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("3.2.1.0")]
35-
[assembly: AssemblyFileVersion("3.2.1.0")]
34+
[assembly: AssemblyVersion("3.2.1.3")]
35+
[assembly: AssemblyFileVersion("3.2.1.3")]

‎Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Sif.Framework.EnvironmentProvider.csproj‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<SpecificVersion>False</SpecificVersion>
4545
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
4646
</Reference>
47-
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\Sif3FrameworkDemo\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
47+
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
48+
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
49+
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Microsoft.CSharp" />
5252
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -61,6 +61,14 @@
6161
<SpecificVersion>False</SpecificVersion>
6262
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
6363
</Reference>
64+
<Reference Include="slf4net, Version=0.1.32.1, Culture=neutral, PublicKeyToken=592edb3b6b36b5ba, processorArchitecture=MSIL">
65+
<HintPath>..\packages\slf4net.0.1.32.1\lib\net35\slf4net.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="slf4net.log4net, Version=0.1.32.1, Culture=neutral, PublicKeyToken=592edb3b6b36b5ba, processorArchitecture=MSIL">
69+
<HintPath>..\packages\slf4net.log4net.0.1.32.1\lib\net35\slf4net.log4net.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
6472
<Reference Include="System.Data.SQLite, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
6573
<SpecificVersion>False</SpecificVersion>
6674
<HintPath>..\packages\System.Data.SQLite.Core.1.0.94.0\lib\net45\System.Data.SQLite.dll</HintPath>
@@ -117,6 +125,9 @@
117125
<Content Include="packages.config">
118126
<SubType>Designer</SubType>
119127
</Content>
128+
<Content Include="log4net.config">
129+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
130+
</Content>
120131
<None Include="Web.Debug.config">
121132
<DependentUpon>Web.config</DependentUpon>
122133
</None>

‎Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Web.config‎

Lines changed: 15 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
44
http://go.microsoft.com/fwlink/?LinkId=301879
55
-->
66
<configuration>
7-
<!-- Register a section handler for the log4net section -->
87
<configSections>
9-
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
8+
<section name="slf4net" type="slf4net.Configuration.SlfConfigurationSection, slf4net" />
109
</configSections>
11-
10+
<slf4net>
11+
<factory type="slf4net.log4net.Log4netLoggerFactory, slf4net.log4net">
12+
<factory-data>
13+
<configFile value="log4net.config" />
14+
<watch value="true" />
15+
</factory-data>
16+
</factory>
17+
</slf4net>
1218
<system.web>
1319
<compilation debug="true" targetFramework="4.5" />
1420
<httpRuntime targetFramework="4.5" />
1521
</system.web>
16-
1722
<runtime>
1823
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1924
<dependentAssembly>
@@ -28,75 +33,22 @@
2833
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
2934
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
3035
</dependentAssembly>
36+
<dependentAssembly>
37+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
38+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
39+
</dependentAssembly>
3140
</assemblyBinding>
3241
</runtime>
3342
<system.webServer>
3443
<handlers>
35-
<remove name="WebDAV"/>
44+
<remove name="WebDAV" />
3645
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
3746
<remove name="OPTIONSVerbHandler" />
3847
<remove name="TRACEVerbHandler" />
3948
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
4049
</handlers>
4150
<modules>
42-
<remove name="WebDAVModule"/>
51+
<remove name="WebDAVModule" />
4352
</modules>
4453
</system.webServer>
45-
46-
<!-- This section contains the log4net configuration settings. -->
47-
<log4net>
48-
<appender name="ManagedColoredConsoleAppender" type="log4net.Appender.ManagedColoredConsoleAppender">
49-
<layout type="log4net.Layout.PatternLayout">
50-
<conversionPattern value="%date{yyyyMMdd;HH:mm:ss} %level %logger{1} - %message%newline"/>
51-
</layout>
52-
<mapping>
53-
<level value="ERROR" />
54-
<foreColor value="DarkRed" />
55-
</mapping>
56-
<mapping>
57-
<level value="WARN" />
58-
<foreColor value="DarkYellow" />
59-
</mapping>
60-
<mapping>
61-
<level value="DEBUG" />
62-
<foreColor value="DarkGreen" />
63-
</mapping>
64-
<mapping>
65-
<level value="INFO" />
66-
<foreColor value="DarkBlue" />
67-
</mapping>
68-
<layout type="log4net.Layout.PatternLayout">
69-
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
70-
</layout>
71-
</appender>
72-
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
73-
<file value="App.log"/>
74-
<appendToFile value="true"/>
75-
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
76-
<maxSizeRollBackups value="10"/>
77-
<maximumFileSize value="1MB"/>
78-
<rollingStyle value="Size"/>
79-
<staticLogFileName value="true"/>
80-
<layout type="log4net.Layout.PatternLayout">
81-
<header value="[START %utcdate]&#xD;&#xA;" />
82-
<footer value="[END %utcdate]&#xD;&#xA;" />
83-
<conversionPattern value="%utcdate %-5level %logger{3} - %property{instance} - %message%newline"/>
84-
</layout>
85-
</appender>
86-
<root>
87-
<level value="WARN"/>
88-
<appender-ref ref="ManagedColoredConsoleAppender"/>
89-
<appender-ref ref="RollingLogFileAppender"/>
90-
</root>
91-
<!-- Specify the level for some specific categories -->
92-
<!--logger name="NHibernate">
93-
<level value="WARN"/>
94-
</logger-->
95-
<logger name="Sif.Framework">
96-
<level value="DEBUG"/>
97-
</logger>
98-
<logger name="Sif.Framework.EnvironmentProvider">
99-
<level value="DEBUG"/>
100-
</logger>
101-
</log4net>
10254
</configuration>

‎Code/Sif3Framework/Sif.Framework.EnvironmentProvider/log4net.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
5+
</configSections>
6+
<log4net>
7+
<appender name="TraceAppender" type="log4net.Appender.TraceAppender">
8+
<layout type="log4net.Layout.PatternLayout">
9+
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
10+
</layout>
11+
</appender>
12+
<root>
13+
<level value="WARN" />
14+
<appender-ref ref="TraceAppender" />
15+
</root>
16+
<logger name="Sif.Framework">
17+
<level value="DEBUG" />
18+
</logger>
19+
</log4net>
20+
</configuration>

‎Code/Sif3Framework/Sif.Framework.EnvironmentProvider/packages.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
4+
<package id="log4net" version="2.0.8" targetFramework="net45" />
45
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
56
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
67
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
78
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
89
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
9-
<package id="log4net" version="2.0.3" targetFramework="net45" />
1010
<package id="NHibernate" version="4.0.1.4000" targetFramework="net45" />
11+
<package id="slf4net" version="0.1.32.1" targetFramework="net45" />
12+
<package id="slf4net.log4net" version="0.1.32.1" targetFramework="net45" />
1113
<package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net45" />
1214
</packages>

‎Code/Sif3Framework/Sif.Framework.Tests/App.config‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
3+
<configSections>
4+
<section name="slf4net" type="slf4net.Configuration.SlfConfigurationSection, slf4net" />
5+
</configSections>
6+
<slf4net>
7+
<factory type="slf4net.log4net.Log4netLoggerFactory, slf4net.log4net">
8+
<factory-data>
9+
<configFile value="log4net.config" />
10+
<watch value="true" />
11+
</factory-data>
12+
</factory>
13+
</slf4net>
414
<runtime>
515
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
616
<dependentAssembly>
@@ -11,7 +21,10 @@
1121
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1222
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
1323
</dependentAssembly>
24+
<dependentAssembly>
25+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
26+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
27+
</dependentAssembly>
1428
</assemblyBinding>
1529
</runtime>
16-
1730
</configuration>

‎Code/Sif3Framework/Sif.Framework.Tests/Data files/environment.xml‎

4 Bytes
Binary file not shown.

‎Code/Sif3Framework/Sif.Framework.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.2.1.0")]
36-
[assembly: AssemblyFileVersion("3.2.1.0")]
35+
[assembly: AssemblyVersion("3.2.1.3")]
36+
[assembly: AssemblyFileVersion("3.2.1.3")]

‎Code/Sif3Framework/Sif.Framework.Tests/Sif.Framework.Tests.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
<SpecificVersion>False</SpecificVersion>
4040
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
4141
</Reference>
42+
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
43+
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
44+
<Private>True</Private>
45+
</Reference>
4246
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
4347
<SpecificVersion>False</SpecificVersion>
4448
<HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
@@ -47,6 +51,14 @@
4751
<SpecificVersion>False</SpecificVersion>
4852
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
4953
</Reference>
54+
<Reference Include="slf4net, Version=0.1.32.1, Culture=neutral, PublicKeyToken=592edb3b6b36b5ba, processorArchitecture=MSIL">
55+
<HintPath>..\packages\slf4net.0.1.32.1\lib\net35\slf4net.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
58+
<Reference Include="slf4net.log4net, Version=0.1.32.1, Culture=neutral, PublicKeyToken=592edb3b6b36b5ba, processorArchitecture=MSIL">
59+
<HintPath>..\packages\slf4net.log4net.0.1.32.1\lib\net35\slf4net.log4net.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
5062
<Reference Include="System" />
5163
<Reference Include="System.ComponentModel.DataAnnotations" />
5264
<Reference Include="System.Data" />
@@ -103,6 +115,9 @@
103115
<None Include="App.config">
104116
<SubType>Designer</SubType>
105117
</None>
118+
<Content Include="log4net.config">
119+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
120+
</Content>
106121
<None Include="packages.config">
107122
<SubType>Designer</SubType>
108123
</None>

‎Code/Sif3Framework/Sif.Framework.Tests/log4net.config‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
5+
</configSections>
6+
<log4net>
7+
<appender name="ManagedColoredConsoleAppender" type="log4net.Appender.ManagedColoredConsoleAppender">
8+
<layout type="log4net.Layout.PatternLayout">
9+
<conversionPattern value="%date{yyyyMMdd;HH:mm:ss} %level %logger{1} - %message%newline" />
10+
</layout>
11+
<mapping>
12+
<level value="ERROR" />
13+
<foreColor value="White" />
14+
<backColor value="DarkRed" />
15+
</mapping>
16+
<mapping>
17+
<level value="WARN" />
18+
<foreColor value="White" />
19+
<backColor value="DarkYellow" />
20+
</mapping>
21+
<layout type="log4net.Layout.PatternLayout">
22+
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
23+
</layout>
24+
</appender>
25+
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
26+
<file value="App.log" />
27+
<appendToFile value="true" />
28+
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
29+
<maxSizeRollBackups value="10" />
30+
<maximumFileSize value="1MB" />
31+
<rollingStyle value="Size" />
32+
<staticLogFileName value="true" />
33+
<layout type="log4net.Layout.DynamicPatternLayout">
34+
<header value="[BEGIN %date]%newline" />
35+
<footer value="[END %date]%newline" />
36+
<conversionPattern value="%date %-5level %logger{3} - %property{instance} - %message%newline" />
37+
</layout>
38+
</appender>
39+
<root>
40+
<level value="WARN" />
41+
<appender-ref ref="ManagedColoredConsoleAppender" />
42+
<appender-ref ref="RollingFileAppender" />
43+
</root>
44+
<logger name="Sif.Framework">
45+
<level value="DEBUG" />
46+
</logger>
47+
</log4net>
48+
</configuration>

0 commit comments

Comments
 (0)