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

Commit d0fd43f

Browse files
author
Jeroen
committed
Merge branch 'release/2.0.0'
2 parents 8d9e429 + d79e45d commit d0fd43f

25 files changed

+397
-167
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,4 @@ $RECYCLE.BIN/
151151
# Mac crap
152152
.DS_Store
153153

154+
.vs/config/applicationhost.config

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

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<DocumentationFile>bin\Debug\EPi.Libraries.Logging.Serilog.AppSettings.XML</DocumentationFile>
2727
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
2828
<RunCodeAnalysis>true</RunCodeAnalysis>
29+
<CodeAnalysisRuleSet>..\Solution Files\EPiServer.Libraries.ruleset</CodeAnalysisRuleSet>
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3132
<DebugType>pdbonly</DebugType>
@@ -47,40 +48,36 @@
4748
<AssemblyOriginatorKeyFile>EPiServer.Libraries.snk</AssemblyOriginatorKeyFile>
4849
</PropertyGroup>
4950
<ItemGroup>
50-
<Reference Include="EPiServer.ApplicationModules, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
51-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.ApplicationModules.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
54-
<Reference Include="EPiServer.Data, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
55-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Data.dll</HintPath>
51+
<Reference Include="EPiServer.ApplicationModules, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
52+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.ApplicationModules.dll</HintPath>
5653
<Private>True</Private>
5754
</Reference>
58-
<Reference Include="EPiServer.Data.Cache, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
59-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Data.Cache.dll</HintPath>
55+
<Reference Include="EPiServer.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
56+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.dll</HintPath>
6057
<Private>True</Private>
6158
</Reference>
62-
<Reference Include="EPiServer.Events, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
63-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Events.dll</HintPath>
59+
<Reference Include="EPiServer.Data.Cache, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
60+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.Cache.dll</HintPath>
6461
<Private>True</Private>
6562
</Reference>
66-
<Reference Include="EPiServer.Framework, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
67-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Framework.dll</HintPath>
63+
<Reference Include="EPiServer.Events, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
64+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Events.dll</HintPath>
6865
<Private>True</Private>
6966
</Reference>
70-
<Reference Include="EPiServer.Licensing, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
71-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Licensing.dll</HintPath>
67+
<Reference Include="EPiServer.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
68+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Framework.dll</HintPath>
7269
<Private>True</Private>
7370
</Reference>
74-
<Reference Include="EPiServer.Shell, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
75-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Shell.dll</HintPath>
71+
<Reference Include="EPiServer.Licensing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
72+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Licensing.dll</HintPath>
7673
<Private>True</Private>
7774
</Reference>
7875
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7976
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
8077
<Private>True</Private>
8178
</Reference>
82-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
79+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
8481
<Private>True</Private>
8582
</Reference>
8683
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -158,13 +155,6 @@
158155
<None Include="readme.txt" />
159156
</ItemGroup>
160157
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
161-
<Import Project="..\packages\GitVersionTask.3.3.0\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.3.0\build\dotnet\GitVersionTask.targets')" />
162-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
163-
<PropertyGroup>
164-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
165-
</PropertyGroup>
166-
<Error Condition="!Exists('..\packages\GitVersionTask.3.3.0\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.3.0\build\dotnet\GitVersionTask.targets'))" />
167-
</Target>
168158
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169159
Other similar extension points exist, see Microsoft.Common.targets.
170160
<Target Name="BeforeBuild">

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<package >
2+
3+
<package>
34
<metadata>
45
<id>$id$</id>
56
<version>$version$</version>
@@ -10,14 +11,14 @@
1011
<iconUrl>http://jstemerdink.net/images/js-nuget.png</iconUrl>
1112
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1213
<description>$description$</description>
13-
<releaseNotes></releaseNotes>
14-
<copyright>Copyright © Jeroen Stemerdink 2015</copyright>
14+
<releaseNotes>Updated to EPiServer 10</releaseNotes>
15+
<copyright>Copyright © Jeroen Stemerdink 2016</copyright>
1516
<tags>logging Serilog</tags>
1617
<dependencies>
17-
<dependency id="EPi.Libraries.Logging.Serilog" version="1.0.0" />
18+
<dependency id="EPi.Libraries.Logging.Serilog" version="2.0.0" />
1819
</dependencies>
1920
</metadata>
20-
<files>
21+
<files>
2122
<file src="web.config.install.xdt" target="content" />
2223
<file src="readme.txt" target="" />
2324
</files>

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

2.06 KB
Binary file not shown.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 Jeroen
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

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

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
1-
using EPiServer.ServiceLocation;
2-
3-
using Serilog;
4-
1+
// Copyright © 2016 Jeroen Stemerdink.
2+
// Permission is hereby granted, free of charge, to any person
3+
// obtaining a copy of this software and associated documentation
4+
// files (the "Software"), to deal in the Software without
5+
// restriction, including without limitation the rights to use,
6+
// copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
// copies of the Software, and to permit persons to whom the
8+
// Software is furnished to do so, subject to the following
9+
// conditions:
10+
// The above copyright notice and this permission notice shall be
11+
// included in all copies or substantial portions of the Software.
12+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
13+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
14+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
15+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
16+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
17+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
19+
// OTHER DEALINGS IN THE SOFTWARE.
520
namespace EPi.Libraries.Logging.Serilog.AppSettings
621
{
22+
using EPiServer.ServiceLocation;
23+
24+
using global::Serilog;
25+
726
/// <summary>
827
/// Class LoggerConfigurator.
928
/// </summary>
@@ -21,4 +40,4 @@ public ILogger GetLogger()
2140
return this.logger ?? (this.logger = new LoggerConfiguration().ReadFrom.AppSettings().CreateLogger());
2241
}
2342
}
24-
}
43+
}

‎EPi.Libraries.Logging.Serilog.AppSettings/Properties/AssemblyInfo.cs‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
using System;
1+
// Copyright © 2016 Jeroen Stemerdink.
2+
// Permission is hereby granted, free of charge, to any person
3+
// obtaining a copy of this software and associated documentation
4+
// files (the "Software"), to deal in the Software without
5+
// restriction, including without limitation the rights to use,
6+
// copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
// copies of the Software, and to permit persons to whom the
8+
// Software is furnished to do so, subject to the following
9+
// conditions:
10+
// The above copyright notice and this permission notice shall be
11+
// included in all copies or substantial portions of the Software.
12+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
13+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
14+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
15+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
16+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
17+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
19+
// OTHER DEALINGS IN THE SOFTWARE.
20+
using System;
221
using System.Reflection;
3-
using System.Runtime.CompilerServices;
422
using System.Runtime.InteropServices;
523

624
// General Information about an assembly is controlled through the following
@@ -11,16 +29,15 @@
1129
[assembly: AssemblyConfiguration("")]
1230
[assembly: AssemblyCompany("Jeroen Stemerdink")]
1331
[assembly: AssemblyProduct("EPi.Libraries.Logging.Serilog.AppSettings")]
14-
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2015")]
32+
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2016")]
1533
[assembly: AssemblyTrademark("")]
1634
[assembly: AssemblyCulture("")]
1735

1836
// Setting ComVisible to false makes the types in this assembly not visible
1937
// to COM components. If you need to access a type in this assembly from
2038
// COM, set the ComVisible attribute to true on that type.
2139
[assembly: ComVisible(false)]
22-
2340
[assembly: CLSCompliant(true)]
2441

2542
// The following GUID is for the ID of the typelib if this project is exposed to COM
26-
[assembly: Guid("27f44e83-32d4-4493-a678-f42bd5d4c730")]
43+
[assembly: Guid("27f44e83-32d4-4493-a678-f42bd5d4c730")]

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@
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)
44
[![GitHub version](https://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.Logging.Serilog.svg)](http://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.Logging.Serilog)
55
[![Platform](https://img.shields.io/badge/platform-.NET 4.5-blue.svg?style=flat)](https://msdn.microsoft.com/en-us/library/w0x726c2%28v=vs.110%29.aspx)
6-
[![Platform](https://img.shields.io/badge/EPiServer-%209.0.3-orange.svg?style=flat)](http://world.episerver.com/cms/)
6+
[![Platform](https://img.shields.io/badge/EPiServer-%2010.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)
88

99
## About
1010
This will add a Serilog configuration to your site, using settings configured in the appSettings.
1111
See [Serilog wiki](https://github.com/serilog/serilog/wiki/ for information about Serilog.
1212
See [Serilog Wiki](https://github.com/serilog/serilog/wiki/AppSettings) for all configuration options.
1313

14-
## Requirements
14+
> *Powered by ReSharper*
1515
16-
* EPiServer >= 9.0.3
17-
* Serilog
18-
* EPi.Libraries.Logging.Serilog
19-
* .Net 4.5
16+
> [![image](http://resources.jetbrains.com/assets/media/open-graph/jetbrains_250x250.png)](http://jetbrains.com)
2017
2118

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="EPiServer.Framework" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="EPiServer.Licensing" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="EPiServer.Data" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="EPiServer.ApplicationModules" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="EPiServer.Data.Cache" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="EPiServer.Events" publicKeyToken="8fe83dea738b45b7" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
32+
</dependentAssembly>
33+
</assemblyBinding>
34+
</runtime>
35+
</configuration>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EPiServer.Framework" version="9.0.3" targetFramework="net45" developmentDependency="true" />
4-
<package id="GitVersionTask" version="3.3.0" targetFramework="net45" developmentDependency="true" />
3+
<package id="EPiServer.Framework" version="10.0.0" targetFramework="net45" developmentDependency="true" />
54
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" developmentDependency="true" />
65
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" developmentDependency="true" />
76
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" developmentDependency="true" />
87
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" developmentDependency="true" />
9-
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" developmentDependency="true" />
8+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" developmentDependency="true" />
109
<package id="Serilog" version="1.5.14" targetFramework="net45" developmentDependency="true" />
1110
<package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net45" developmentDependency="true" />
1211
<package id="structuremap-signed" version="3.1.6.186" targetFramework="net45" developmentDependency="true" />

0 commit comments

Comments
 (0)