Skip to content

Commit d8a5a92

Browse files
sbohlensbohlen
committed
Adding support for NLog 4.4.12
1 parent 90d11a1 commit d8a5a92

9 files changed

+1373
-0
lines changed

‎Common.Logging.2010.sln

+30
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.Log4Net207.T
236236
EndProject
237237
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.Log4Net207.Tests.Integration.2010-net40", "test\Common.Logging.Log4Net207.Integration.Tests\Common.Logging.Log4Net207.Tests.Integration.2010-net40.csproj", "{FF9DF745-B63D-42D5-B21D-9F6676DA8BDA}"
238238
EndProject
239+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLog-4.4.12", "NLog-4.4.12", "{645E8182-EEAF-44AD-8DE2-5B15D2E1BD76}"
240+
EndProject
241+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog4412.2010-net40", "src\Common.Logging.NLog4412\Common.Logging.NLog4412.2010-net40.csproj", "{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}"
242+
EndProject
243+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog4412.Tests.2010-net40", "test\Common.Logging.NLog4412.Tests\Common.Logging.NLog4412.Tests.2010-net40.csproj", "{7D87085A-C95D-421B-BE22-27B24163AC0B}"
244+
ProjectSection(ProjectDependencies) = postProject
245+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA} = {E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}
246+
EndProjectSection
247+
EndProject
248+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog4412.Tests.Integration.2010-net40", "test\Common.Logging.NLog4412.Integration.Tests\Common.Logging.NLog4412.Tests.Integration.2010-net40.csproj", "{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697}"
249+
ProjectSection(ProjectDependencies) = postProject
250+
{7D87085A-C95D-421B-BE22-27B24163AC0B} = {7D87085A-C95D-421B-BE22-27B24163AC0B}
251+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA} = {E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}
252+
EndProjectSection
253+
EndProject
239254
Global
240255
GlobalSection(SolutionConfigurationPlatforms) = preSolution
241256
Debug|Any CPU = Debug|Any CPU
@@ -582,6 +597,18 @@ Global
582597
{FF9DF745-B63D-42D5-B21D-9F6676DA8BDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
583598
{FF9DF745-B63D-42D5-B21D-9F6676DA8BDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
584599
{FF9DF745-B63D-42D5-B21D-9F6676DA8BDA}.Release|Any CPU.Build.0 = Release|Any CPU
600+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
601+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
602+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
603+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}.Release|Any CPU.Build.0 = Release|Any CPU
604+
{7D87085A-C95D-421B-BE22-27B24163AC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
605+
{7D87085A-C95D-421B-BE22-27B24163AC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
606+
{7D87085A-C95D-421B-BE22-27B24163AC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
607+
{7D87085A-C95D-421B-BE22-27B24163AC0B}.Release|Any CPU.Build.0 = Release|Any CPU
608+
{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
609+
{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697}.Debug|Any CPU.Build.0 = Debug|Any CPU
610+
{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697}.Release|Any CPU.ActiveCfg = Release|Any CPU
611+
{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697}.Release|Any CPU.Build.0 = Release|Any CPU
585612
EndGlobalSection
586613
GlobalSection(SolutionProperties) = preSolution
587614
HideSolutionNode = FALSE
@@ -672,6 +699,9 @@ Global
672699
{21365945-4D99-4B73-ABBC-B90437B34AD4} = {A1244AE0-2ACF-467C-BBE0-A75DCB5902CF}
673700
{901D6795-F2A2-4884-837C-2EE74D2B01A5} = {A1244AE0-2ACF-467C-BBE0-A75DCB5902CF}
674701
{FF9DF745-B63D-42D5-B21D-9F6676DA8BDA} = {A1244AE0-2ACF-467C-BBE0-A75DCB5902CF}
702+
{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA} = {645E8182-EEAF-44AD-8DE2-5B15D2E1BD76}
703+
{7D87085A-C95D-421B-BE22-27B24163AC0B} = {645E8182-EEAF-44AD-8DE2-5B15D2E1BD76}
704+
{FD1B1313-BF7E-4EB7-910A-D8ABA9A33697} = {645E8182-EEAF-44AD-8DE2-5B15D2E1BD76}
675705
EndGlobalSection
676706
GlobalSection(ExtensibilityGlobals) = postSolution
677707
NAntAddinLastFileName = Common.Logging.build

‎src/Common.Logging.NLog4412/AssemblyInfo.cs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System.Reflection;
2+
using System.Security;
3+
4+
[assembly: AssemblyProduct("Common Logging Framework NLog 4.4.12 Adapter")]
5+
[assembly: SecurityTransparent]
6+
7+
#if NET_4_0
8+
[assembly: SecurityRules(SecurityRuleSet.Level1)]
9+
#endif

‎src/Common.Logging.NLog4412/Common.Logging.NLog4412.2010-net40.csproj

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>9.0.30729</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{E9D93D91-F2C8-4037-A603-E3B2A6C06AFA}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>Common</RootNamespace>
12+
<AssemblyName>Common.Logging.NLog4412</AssemblyName>
13+
<FileUpgradeFlags>
14+
</FileUpgradeFlags>
15+
<OldToolsVersion>3.5</OldToolsVersion>
16+
<UpgradeBackupLocation>
17+
</UpgradeBackupLocation>
18+
<IsWebBootstrapper>false</IsWebBootstrapper>
19+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
20+
<PublishUrl>publish\</PublishUrl>
21+
<Install>true</Install>
22+
<InstallFrom>Disk</InstallFrom>
23+
<UpdateEnabled>false</UpdateEnabled>
24+
<UpdateMode>Foreground</UpdateMode>
25+
<UpdateInterval>7</UpdateInterval>
26+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
27+
<UpdatePeriodically>false</UpdatePeriodically>
28+
<UpdateRequired>false</UpdateRequired>
29+
<MapFileExtensions>true</MapFileExtensions>
30+
<ApplicationRevision>0</ApplicationRevision>
31+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32+
<UseApplicationTrust>false</UseApplicationTrust>
33+
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
35+
</PropertyGroup>
36+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37+
<DebugSymbols>true</DebugSymbols>
38+
<DebugType>full</DebugType>
39+
<Optimize>false</Optimize>
40+
<OutputPath>..\..\build\net40\Common.Logging.NLog4412\Debug\</OutputPath>
41+
<DefineConstants>TRACE;DEBUG;NET_4_0;NLOG2</DefineConstants>
42+
<ErrorReport>prompt</ErrorReport>
43+
<WarningLevel>4</WarningLevel>
44+
<DocumentationFile>Common.Logging.NLog4412.xml</DocumentationFile>
45+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
46+
<NoWarn>1607</NoWarn>
47+
<UseVSHostingProcess>false</UseVSHostingProcess>
48+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
49+
</PropertyGroup>
50+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
51+
<DebugType>pdbonly</DebugType>
52+
<Optimize>true</Optimize>
53+
<OutputPath>..\..\build\net40\Common.Logging.NLog4412\Release\</OutputPath>
54+
<DefineConstants>TRACE;NET_4_0;NLOG2</DefineConstants>
55+
<ErrorReport>prompt</ErrorReport>
56+
<WarningLevel>4</WarningLevel>
57+
<DocumentationFile>Common.Logging.NLog4412.xml</DocumentationFile>
58+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
59+
<NoWarn>1607</NoWarn>
60+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
61+
</PropertyGroup>
62+
<ItemGroup>
63+
<Reference Include="NLog">
64+
<HintPath>..\..\lib\NLog4412\net\net40\NLog.dll</HintPath>
65+
</Reference>
66+
<Reference Include="System" />
67+
<Reference Include="System.configuration" />
68+
<Reference Include="System.Data" />
69+
<Reference Include="System.Xml" />
70+
</ItemGroup>
71+
<ItemGroup>
72+
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\CommonLoggingTarget.cs">
73+
<Link>Logging\NLog\CommonLoggingTarget.cs</Link>
74+
</Compile>
75+
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\NLogLogger.cs">
76+
<Link>Logging\NLog\NLogLogger.cs</Link>
77+
</Compile>
78+
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\NLogLoggerFactoryAdapter.cs">
79+
<Link>Logging\NLog\NLogLoggerFactoryAdapter.cs</Link>
80+
</Compile>
81+
<Compile Include="..\Common.Logging.NLog20\Logging\NLog\NLogLogger.VariablesContext.cs">
82+
<Link>Logging\NLog\NLogLogger.VariablesContext.cs</Link>
83+
</Compile>
84+
<Compile Include="..\Common.Logging.NLog20\Logging\NLog\NLogThreadVariablesContext.cs">
85+
<Link>Logging\NLog\NLogThreadVariablesContext.cs</Link>
86+
</Compile>
87+
<Compile Include="..\Common.Logging.NLog41\Logging\NLog\NLogGlobalVariablesContext.cs">
88+
<Link>Logging\NLog\NLogGlobalVariablesContext.cs</Link>
89+
</Compile>
90+
<Compile Include="..\Common.Logging.NLog41\Logging\NLog\NLogNestedThreadVariablesContext.cs">
91+
<Link>Logging\NLog\NLogNestedThreadVariablesContext.cs</Link>
92+
</Compile>
93+
<Compile Include="..\CommonAssemblyInfo.cs">
94+
<Link>CommonAssemblyInfo.cs</Link>
95+
</Compile>
96+
<Compile Include="AssemblyInfo.cs" />
97+
</ItemGroup>
98+
<ItemGroup>
99+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
100+
<Visible>False</Visible>
101+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
102+
<Install>false</Install>
103+
</BootstrapperPackage>
104+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
105+
<Visible>False</Visible>
106+
<ProductName>.NET Framework 3.5 SP1</ProductName>
107+
<Install>true</Install>
108+
</BootstrapperPackage>
109+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
110+
<Visible>False</Visible>
111+
<ProductName>Windows Installer 3.1</ProductName>
112+
<Install>true</Install>
113+
</BootstrapperPackage>
114+
</ItemGroup>
115+
<ItemGroup />
116+
<ItemGroup>
117+
<ProjectReference Include="..\Common.Logging.Core\Common.Logging.Core.2010.csproj">
118+
<Project>{7eeb2191-b3fc-4509-aa4b-a345c386eeed}</Project>
119+
<Name>Common.Logging.Core.2010</Name>
120+
</ProjectReference>
121+
<ProjectReference Include="..\Common.Logging\Common.Logging.2010-net40.csproj">
122+
<Project>{440D903A-D409-48FC-A6C4-3EE69CCD663B}</Project>
123+
<Name>Common.Logging.2010-net40</Name>
124+
</ProjectReference>
125+
</ItemGroup>
126+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
127+
<ProjectExtensions>
128+
<VisualStudio>
129+
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c3faaf50-ca05-42a5-9616-b48c21643d03" />
130+
</VisualStudio>
131+
</ProjectExtensions>
132+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
133+
Other similar extension points exist, see Microsoft.Common.targets.
134+
<Target Name="BeforeBuild">
135+
</Target>
136+
<Target Name="AfterBuild">
137+
</Target>
138+
-->
139+
</Project>

‎src/Common.Logging.NLog4412/Common.Logging.NLog4412.nuspec

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Common.Logging.NLog4412</id>
5+
<version>0.0.0</version>
6+
<!-- placeholder value replaced by build script -->
7+
<authors>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</authors>
8+
<owners>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</owners>
9+
<projectUrl>http://net-commons.github.io/common-logging/</projectUrl>
10+
<iconUrl>https://raw.githubusercontent.com/net-commons/common-logging/master/nuget-graphics/common-logging-icon.png</iconUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>Common.Logging library bindings for NLog 4.4.12 logging framework.</description>
13+
<tags>NLog Common.Logging.NLog logging log Common.Logging</tags>
14+
<language>en-US</language>
15+
<dependencies>
16+
<dependency id="Common.Logging" version="3.4.1" />
17+
<dependency id="NLog" version="4.4.12" />
18+
</dependencies>
19+
</metadata>
20+
<files>
21+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.dll" target="lib\net40" />
22+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.pdb" target="lib\net40" />
23+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.xml" target="lib\net40" />
24+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.dll" target="lib\MonoAndroid10" />
25+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.pdb" target="lib\MonoAndroid10" />
26+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.xml" target="lib\MonoAndroid10" />
27+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.dll" target="lib\Xamarin.iOS10" />
28+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.pdb" target="lib\Xamarin.iOS10" />
29+
<file src="..\..\build\net40\Common.Logging.NLog4412\Release\Common.Logging.NLog4412.xml" target="lib\Xamarin.iOS10" />
30+
</files>
31+
</package>

0 commit comments

Comments
 (0)