Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit fafb80f

Browse files
author
NL\Jeroen.Stemerdink
committed
Merge branch 'release/3.1.0'
2 parents 431553b + 0e532ca commit fafb80f

22 files changed

+266
-186
lines changed

‎EPi.Libraries.Logging.Serilog.AppSettings/EPi.Libraries.Logging.Serilog.AppSettings.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,23 @@
118118
<HintPath>..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll</HintPath>
119119
</Reference>
120120
<Reference Include="System.Transactions" />
121-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
121+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
123123
</Reference>
124-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
124+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
126126
</Reference>
127-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128-
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
127+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
129129
</Reference>
130-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
130+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
132132
</Reference>
133-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
133+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
135135
</Reference>
136-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
136+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
138138
</Reference>
139139
<Reference Include="System.Xml.Linq" />
140140
<Reference Include="System.Data.DataSetExtensions" />

‎EPi.Libraries.Logging.Serilog.AppSettings/EPi.Libraries.Logging.Serilog.AppSettings.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<copyright>Copyright © Jeroen Stemerdink 2018</copyright>
1616
<tags>logging Serilog</tags>
1717
<dependencies>
18-
<dependency id="EPi.Libraries.Logging.Serilog" version="3.0.0" />
18+
<dependency id="EPi.Libraries.Logging.Serilog" version="3.1.0" />
1919
<dependency id="Serilog.Settings.AppSettings" version="2.1.2" />
2020
</dependencies>
2121
</metadata>

‎EPi.Libraries.Logging.Serilog.AppSettings/LoggerConfigurator.cs‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
1818
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
1919
// OTHER DEALINGS IN THE SOFTWARE.
20+
2021
namespace EPi.Libraries.Logging.Serilog.AppSettings
2122
{
2223
using System;
@@ -37,14 +38,33 @@ public class LoggerConfigurator : ILoggerConfigurator
3738
/// </summary>
3839
private Logger logger;
3940

41+
/// <summary>
42+
/// Indicating whether the instance is disposed.
43+
/// </summary>
44+
private bool disposed;
45+
46+
/// <summary>
47+
/// Finalizes an instance of the <see cref="LoggerConfigurator"/> class.
48+
/// </summary>
49+
~LoggerConfigurator()
50+
{
51+
this.Dispose(false);
52+
}
53+
4054
/// <summary>
4155
/// Gets a <see cref="T:Serilog.ILogger" /> instance for the provided name.
4256
/// </summary>
4357
/// <param name="name">Name of the logger</param>
4458
/// <returns>A new <see cref="T:Serilog.ILogger" /> instance for the provided name.</returns>
4559
public ILogger GetLogger(string name)
4660
{
47-
return this.logger ?? (this.logger = new LoggerConfiguration().ReadFrom.AppSettings().CreateLogger());
61+
ILogger configuredLogger = this.logger ?? (this.logger =
62+
new LoggerConfiguration().ReadFrom.AppSettings().Enrich
63+
.FromLogContext().CreateLogger());
64+
65+
return string.IsNullOrWhiteSpace(value: name)
66+
? configuredLogger
67+
: configuredLogger.ForContext("Logger", value: name);
4868
}
4969

5070
/// <summary>
@@ -61,7 +81,29 @@ public ILogger GetLogger()
6181
/// </summary>
6282
public void Dispose()
6383
{
64-
this.logger.Dispose();
84+
this.Dispose(true);
85+
GC.SuppressFinalize(this);
86+
}
87+
88+
/// <summary>
89+
/// Releases unmanaged and - optionally - managed resources.
90+
/// </summary>
91+
/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
92+
protected virtual void Dispose(bool disposing)
93+
{
94+
if (this.disposed)
95+
{
96+
return;
97+
}
98+
99+
if (disposing)
100+
{
101+
this.logger?.Information("[Serilog] Closing down and flushing log");
102+
this.logger?.Dispose();
103+
this.logger = null;
104+
}
105+
106+
this.disposed = true;
65107
}
66108
}
67109
}

‎EPi.Libraries.Logging.Serilog.AppSettings/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# EPi.Libraries.Logging.Serilog.AppSettings
22

33
[![Build status](https://ci.appveyor.com/api/projects/status/dc0ds3aafwfui3a3/branch/master?svg=true)](https://ci.appveyor.com/project/jstemerdink/epi-libraries-logging-serilog/branch/master)
4-
[![GitHub version](https://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.Logging.Serilog.svg)](http://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.Logging.Serilog)
4+
![GitHub release](https://img.shields.io/github/release/jstemerdink/EPi.Libraries.Logging.Serilog.svg)
55
[![Platform](https://img.shields.io/badge/platform-.NET%204.6.1-blue.svg?style=flat)](https://msdn.microsoft.com/en-us/library/w0x726c2%28v=vs.110%29.aspx)
66
[![Platform](https://img.shields.io/badge/EPiServer-%2011.0.0-orange.svg?style=flat)](http://world.episerver.com/cms/)
77
[![GitHub license](https://img.shields.io/badge/license-MIT%20license-blue.svg?style=flat)](LICENSE)

‎EPi.Libraries.Logging.Serilog.AppSettings/app.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
<assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
44+
</dependentAssembly>
3745
</assemblyBinding>
3846
</runtime>
3947
</configuration>

‎EPi.Libraries.Logging.Serilog.AppSettings/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EPiServer.Framework" version="11.1.0" targetFramework="net461" developmentDependency="true" />
4-
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net461" developmentDependency="true" />
5-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net461" developmentDependency="true" />
6-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net461" developmentDependency="true" />
4+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" developmentDependency="true" />
5+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" developmentDependency="true" />
6+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" developmentDependency="true" />
77
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" developmentDependency="true" />
88
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" developmentDependency="true" />
99
<package id="Serilog" version="2.6.0" targetFramework="net461" developmentDependency="true" />

‎EPi.Libraries.Logging.Serilog.AppSettings/readme.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
The settings were added to your appsettings:
33

44
<add key="serilog:minimum-level" value="Error" />
5-
<add key="serilog:write-to:RollingFile.pathFormat" value="C:\Logs\myapp-{Date}.txt" />
6-
<add key="serilog:write-to:RollingFile.retainedFileCountLimit" value="10" />
5+
6+
If you want to use e.g. a variable "basepath" in your pathformat, you can add "Environment.SetEnvironmentVariable("BASEPATH", AppDomain.CurrentDomain.BaseDirectory);" to the Application_Start in the global.asax
77

88
See https://github.com/serilog/serilog/wiki/AppSettings for all configuration options.
99

‎EPi.Libraries.Logging.Serilog.AppSettings/web.config.install.xdt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22
<appSettings xdt:Transform="InsertIfMissing"></appSettings>
33
<appSettings>
44
<add key="serilog:minimum-level" value="Error" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)" />
5-
<add key="serilog:write-to:RollingFile.pathFormat" value="C:\Logs\myapp-{Date}.txt" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)" />
6-
<add key="serilog:write-to:RollingFile.retainedFileCountLimit" value="10" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)" />
75
</appSettings>
86
</configuration>

‎EPi.Libraries.Logging.Serilog/EPi.Libraries.Logging.Serilog.csproj‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
<Reference Include="EPiServer.Framework, Version=11.1.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
6565
<HintPath>..\packages\EPiServer.Framework.11.1.0\lib\net461\EPiServer.Framework.dll</HintPath>
6666
</Reference>
67+
<Reference Include="EPiServer.Framework.AspNet, Version=11.1.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
68+
<HintPath>..\packages\EPiServer.Framework.AspNet.11.1.0\lib\net461\EPiServer.Framework.AspNet.dll</HintPath>
69+
</Reference>
6770
<Reference Include="EPiServer.Licensing, Version=11.1.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
6871
<HintPath>..\packages\EPiServer.Framework.11.1.0\lib\net461\EPiServer.Licensing.dll</HintPath>
6972
</Reference>
@@ -113,24 +116,28 @@
113116
<Reference Include="System.Threading.AccessControl, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114117
<HintPath>..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll</HintPath>
115118
</Reference>
119+
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
120+
<HintPath>..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
121+
</Reference>
116122
<Reference Include="System.Transactions" />
117-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
123+
<Reference Include="System.Web" />
124+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
119126
</Reference>
120-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
127+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
122129
</Reference>
123-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124-
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
130+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
125132
</Reference>
126-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
133+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
128135
</Reference>
129-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
136+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
131138
</Reference>
132-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
139+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
134141
</Reference>
135142
<Reference Include="System.Xml.Linq" />
136143
<Reference Include="System.Data.DataSetExtensions" />
@@ -145,13 +152,15 @@
145152
<Compile Include="SeriLogger.cs" />
146153
<Compile Include="SeriLoggerFactory.cs" />
147154
<Compile Include="Properties\AssemblyInfo.cs" />
148-
<Compile Include="SeriLoggerFactoryInitialization.cs" />
155+
<Compile Include="SeriLoggerInitializationModule.cs" />
149156
</ItemGroup>
150157
<ItemGroup>
158+
<None Include="app.config" />
151159
<None Include="EPi.Libraries.Logging.Serilog.nuspec" />
152160
<None Include="EPiServer.Libraries.snk" />
153161
<None Include="packages.config" />
154162
<None Include="README.md" />
163+
<None Include="web.config.install.xdt" />
155164
</ItemGroup>
156165
<ItemGroup>
157166
<None Include="readme.txt" />

‎EPi.Libraries.Logging.Serilog/EPi.Libraries.Logging.Serilog.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
<copyright>Copyright © Jeroen Stemerdink 2018</copyright>
1616
<tags>logging Serilog</tags>
1717
<dependencies>
18-
<dependency id="EPiServer.Framework" version="11.1.0" />
18+
<dependency id="EPiServer.Framework.AspNet" version="11.1.0" />
1919
<dependency id="Serilog" version="2.6.0" />
2020
</dependencies>
2121
</metadata>
2222
<files>
2323
<file src="readme.txt" target="" />
24+
<file src="web.config.install.xdt" target="content" />
2425
</files>
2526
</package>

0 commit comments

Comments
 (0)