Skip to content

Commit

Permalink
first try to add support for NLog-3.2 (issue #75)
Browse files Browse the repository at this point in the history
It is more a template for further work to integrate support for
Nlog-3.2.
  • Loading branch information
FroggieFrog committed Jan 14, 2015
1 parent ecde9c1 commit be1ab81
Show file tree
Hide file tree
Showing 15 changed files with 16,588 additions and 13 deletions.
25 changes: 24 additions & 1 deletion Common.Logging.2010.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EC54316A-A3B9-4EF5-A74C-1EC2344D0EA4}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -142,6 +142,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.Core.2010",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheApplication", "examples\PCLExample\TheApplication\TheApplication.csproj", "{74CE8CDA-60B4-4BC6-A521-5B44B7A6E5A5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLog-3.2", "NLog-3.2", "{C4C06CD4-62A3-4796-950C-126CDD736A19}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog32.2010-net40", "src\Common.Logging.NLog32\Common.Logging.NLog32.2010-net40.csproj", "{33BE0554-42E6-46B5-A340-0A12DA3755DB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog32.Tests.2010-net40", "test\Common.Logging.NLog32.Tests\Common.Logging.NLog32.Tests.2010-net40.csproj", "{5DD06B8D-BF33-488A-8D51-D9568B41FCF7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.NLog32.Tests.Integration.2010-net40", "test\Common.Logging.NLog32.Integration.Tests\Common.Logging.NLog32.Tests.Integration.2010-net40.csproj", "{81E3FC72-5F94-4169-B44D-8F470382B931}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -348,6 +356,18 @@ Global
{74CE8CDA-60B4-4BC6-A521-5B44B7A6E5A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74CE8CDA-60B4-4BC6-A521-5B44B7A6E5A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74CE8CDA-60B4-4BC6-A521-5B44B7A6E5A5}.Release|Any CPU.Build.0 = Release|Any CPU
{33BE0554-42E6-46B5-A340-0A12DA3755DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33BE0554-42E6-46B5-A340-0A12DA3755DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33BE0554-42E6-46B5-A340-0A12DA3755DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33BE0554-42E6-46B5-A340-0A12DA3755DB}.Release|Any CPU.Build.0 = Release|Any CPU
{5DD06B8D-BF33-488A-8D51-D9568B41FCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DD06B8D-BF33-488A-8D51-D9568B41FCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DD06B8D-BF33-488A-8D51-D9568B41FCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DD06B8D-BF33-488A-8D51-D9568B41FCF7}.Release|Any CPU.Build.0 = Release|Any CPU
{81E3FC72-5F94-4169-B44D-8F470382B931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81E3FC72-5F94-4169-B44D-8F470382B931}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81E3FC72-5F94-4169-B44D-8F470382B931}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81E3FC72-5F94-4169-B44D-8F470382B931}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -403,6 +423,9 @@ Global
{E215F828-468E-45B3-8483-245DB607354A} = {DDD4F025-4D00-4CA3-B900-33196F8CE02C}
{7EEB2191-B3FC-4509-AA4B-A345C386EEED} = {D26BC7B2-718C-4F97-AF36-4377E19ECE62}
{74CE8CDA-60B4-4BC6-A521-5B44B7A6E5A5} = {DDD4F025-4D00-4CA3-B900-33196F8CE02C}
{33BE0554-42E6-46B5-A340-0A12DA3755DB} = {C4C06CD4-62A3-4796-950C-126CDD736A19}
{5DD06B8D-BF33-488A-8D51-D9568B41FCF7} = {C4C06CD4-62A3-4796-950C-126CDD736A19}
{81E3FC72-5F94-4169-B44D-8F470382B931} = {C4C06CD4-62A3-4796-950C-126CDD736A19}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
NAntAddinLastFileName = Common.Logging.build
Expand Down
Binary file added lib/NLog32/net/4.0/NLog.dll
Binary file not shown.
15,247 changes: 15,247 additions & 0 deletions lib/NLog32/net/4.0/NLog.xml

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/Common.Logging.NLog32/AssemblyInfo.cs
@@ -0,0 +1,9 @@
using System.Reflection;
using System.Security;

[assembly: AssemblyProduct("Common Logging Framework NLog 3.1 Adapter")]
[assembly: SecurityTransparent]

#if NET_4_0
[assembly: SecurityRules(SecurityRuleSet.Level1)]
#endif
137 changes: 137 additions & 0 deletions src/Common.Logging.NLog32/Common.Logging.NLog32.2010-net40.csproj
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{33BE0554-42E6-46B5-A340-0A12DA3755DB}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Common</RootNamespace>
<AssemblyName>Common.Logging.NLog32</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\build\net40\Common.Logging.NLog32\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET_4_0;NLOG2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>Common.Logging.NLog32.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1607</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\build\net40\Common.Logging.NLog32\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0;NLOG2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>Common.Logging.NLog32.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1607</NoWarn>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=3.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\NLog32\net\4.0\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\CommonLoggingTarget.cs">
<Link>Logging\NLog\CommonLoggingTarget.cs</Link>
</Compile>
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\NLogLogger.cs">
<Link>Logging\NLog\NLogLogger.cs</Link>
</Compile>
<Compile Include="..\Common.Logging.NLog10\Logging\NLog\NLogLoggerFactoryAdapter.cs">
<Link>Logging\NLog\NLogLoggerFactoryAdapter.cs</Link>
</Compile>
<Compile Include="..\Common.Logging.NLog20\Logging\NLog\NLogGlobalVariablesContext.cs">
<Link>Logging\NLog\NLogGlobalVariablesContext.cs</Link>
</Compile>
<Compile Include="..\Common.Logging.NLog20\Logging\NLog\NLogLogger.VariablesContext.cs">
<Link>Logging\NLog\NLogLogger.VariablesContext.cs</Link>
</Compile>
<Compile Include="..\Common.Logging.NLog20\Logging\NLog\NLogThreadVariablesContext.cs">
<Link>Logging\NLog\NLogThreadVariablesContext.cs</Link>
</Compile>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\Common.Logging.Core\Common.Logging.Core.2010.csproj">
<Project>{7eeb2191-b3fc-4509-aa4b-a345c386eeed}</Project>
<Name>Common.Logging.Core.2010</Name>
</ProjectReference>
<ProjectReference Include="..\Common.Logging\Common.Logging.2010-net40.csproj">
<Project>{440D903A-D409-48FC-A6C4-3EE69CCD663B}</Project>
<Name>Common.Logging.2010-net40</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties ProjectLinkReference="c3faaf50-ca05-42a5-9616-b48c21643d03" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
25 changes: 25 additions & 0 deletions src/Common.Logging.NLog32/Common.Logging.NLog32.nuspec
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Common.Logging.NLog32</id>
<version>0.0.0</version>
<!-- placeholder value replaced by build script -->
<authors>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</authors>
<owners>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</owners>
<projectUrl>http://netcommon.sourceforge.net/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/net-commons/common-logging/master/nuget-graphics/common-logging-icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Common.Logging library bindings for NLog 3.2 logging framework.</description>
<tags>NLog Common.Logging.NLog logging log Common.Logging</tags>
<language>en-US</language>
<dependencies>
<dependency id="Common.Logging" version="3.0.0" />
<dependency id="NLog" version="3.2.0" />
</dependencies>
</metadata>
<files>
<file src="..\..\build\net40\Common.Logging.NLog31\Release\Common.Logging.NLog32.dll" target="lib\net40" />
<file src="..\..\build\net40\Common.Logging.NLog31\Release\Common.Logging.NLog32.pdb" target="lib\net40" />
<file src="..\..\build\net40\Common.Logging.NLog31\Release\Common.Logging.NLog32.xml" target="lib\net40" />
</files>
</package>

0 comments on commit be1ab81

Please sign in to comment.