Merge pull request #1 from smarts/release-0.1.0

Release 0.1.0
smarts · May 15, 2015 · 7bd5e8e · 7bd5e8e
2 parents cc77573 + 8bb471f
commit 7bd5e8e
Show file tree

Hide file tree

Showing 10 changed files with 352 additions and 0 deletions.
diff --git a/log4net.Ext.Json.Serializers.net20/log4net.Ext.Json.Serializers.net20.csproj b/log4net.Ext.Json.Serializers.net20/log4net.Ext.Json.Serializers.net20.csproj
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8D56515E-A897-4682-B42B-82BBB48B5B9B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>log4net.Ext.Json.Serializers</RootNamespace>
+    <AssemblyName>log4net.Ext.Json.Serializers</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\lib\net20\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.3\lib\net20-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net.Ext.Json, Version=1.2.13.29, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.Ext.Json.1.2.13.1.2.13.20140804\lib\net20-full\log4net.Ext.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net20\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\shared\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\shared\JsonDotNetSerializer.cs">
+      <Link>JsonDotNetSerializer.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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>
diff --git a/log4net.Ext.Json.Serializers.net20/packages.config b/log4net.Ext.Json.Serializers.net20/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net20" />
+  <package id="log4net.Ext.Json.1.2.13" version="1.2.13.20140804" targetFramework="net20" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net20" />
+</packages>
diff --git a/log4net.Ext.Json.Serializers.net35-client/log4net.Ext.Json.Serializers.net35-client.csproj b/log4net.Ext.Json.Serializers.net35-client/log4net.Ext.Json.Serializers.net35-client.csproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{86B7806D-06AA-4DDF-8CB0-39F759753574}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>log4net.Ext.Json.Serializers</RootNamespace>
+    <AssemblyName>log4net.Ext.Json.Serializers</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\lib\net35-client\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.3\lib\net35-client\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net.Ext.Json, Version=1.2.13.29, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.Ext.Json.1.2.13.1.2.13.20140804\lib\net35-cp\log4net.Ext.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\shared\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\shared\JsonDotNetSerializer.cs">
+      <Link>JsonDotNetSerializer.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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>
diff --git a/log4net.Ext.Json.Serializers.net35-client/packages.config b/log4net.Ext.Json.Serializers.net35-client/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net35-Client" />
+  <package id="log4net.Ext.Json.1.2.13" version="1.2.13.20140804" targetFramework="net35-Client" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35-Client" />
+</packages>
diff --git a/log4net.Ext.Json.Serializers.net35/log4net.Ext.Json.Serializers.net35.csproj b/log4net.Ext.Json.Serializers.net35/log4net.Ext.Json.Serializers.net35.csproj
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2449756A-91D7-4FDE-AC8E-064F0E175A27}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>log4net.Ext.Json.Serializers</RootNamespace>
+    <AssemblyName>log4net.Ext.Json.Serializers</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\lib\net35-full\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.3\lib\net35-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net.Ext.Json, Version=1.2.13.29, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.Ext.Json.1.2.13.1.2.13.20140804\lib\net35-full\log4net.Ext.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\shared\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\shared\JsonDotNetSerializer.cs">
+      <Link>JsonDotNetSerializer.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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>
diff --git a/log4net.Ext.Json.Serializers.net35/packages.config b/log4net.Ext.Json.Serializers.net35/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net35" />
+  <package id="log4net.Ext.Json.1.2.13" version="1.2.13.20140804" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35" />
+</packages>
diff --git a/log4net.Ext.Json.Serializers.nuspec b/log4net.Ext.Json.Serializers.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>log4net.Ext.Json.Serializers</id>
+        <version>$version$</version>
+        <authors>https://github.com/smarts</authors>
+        <owners>https://github.com/smarts</owners>
+        <licenseUrl>http://opensource.org/licenses/mit</licenseUrl>
+        <projectUrl>http://github.com/smarts/log4net.Ext.Json.Serializers</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Serializer(s) meant to be used in conjunction w/ the log4net.Ext.Json library.</description>
+        <copyright>Copyright 2015</copyright>
+        <tags>logging log tracing logfiles json log4net extension</tags>
+        <dependencies>
+          <dependency id="log4net.Ext.Json" version="1.2.13.20140804"/>
+          <dependency id="Newtonsoft.Json" version="6.0.8"/>
+        </dependencies>
+    </metadata>
+    <files>
+      <file src="lib\**\log4net.ext.json.serializers.dll" target="lib\"/>
+    </files>
+</package>
diff --git a/log4net.Ext.Json.Serializers.sln b/log4net.Ext.Json.Serializers.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Json.Serializers.net20", "log4net.Ext.Json.Serializers.net20\log4net.Ext.Json.Serializers.net20.csproj", "{8D56515E-A897-4682-B42B-82BBB48B5B9B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Json.Serializers.net35", "log4net.Ext.Json.Serializers.net35\log4net.Ext.Json.Serializers.net35.csproj", "{2449756A-91D7-4FDE-AC8E-064F0E175A27}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Json.Serializers.net35-client", "log4net.Ext.Json.Serializers.net35-client\log4net.Ext.Json.Serializers.net35-client.csproj", "{86B7806D-06AA-4DDF-8CB0-39F759753574}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8D56515E-A897-4682-B42B-82BBB48B5B9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D56515E-A897-4682-B42B-82BBB48B5B9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D56515E-A897-4682-B42B-82BBB48B5B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D56515E-A897-4682-B42B-82BBB48B5B9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2449756A-91D7-4FDE-AC8E-064F0E175A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2449756A-91D7-4FDE-AC8E-064F0E175A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2449756A-91D7-4FDE-AC8E-064F0E175A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2449756A-91D7-4FDE-AC8E-064F0E175A27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86B7806D-06AA-4DDF-8CB0-39F759753574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86B7806D-06AA-4DDF-8CB0-39F759753574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86B7806D-06AA-4DDF-8CB0-39F759753574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86B7806D-06AA-4DDF-8CB0-39F759753574}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/shared/AssemblyInfo.cs b/shared/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("log4net.Ext.Json.Serializers")]
+[assembly: AssemblyDescription("Serializer(s) meant to be used in conjunction w/ the log4net.Ext.Json library.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("https://github.com/smarts")]
+[assembly: AssemblyProduct("log4net.Ext.Json.Serializers")]
+[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("12256051-d5e4-4ab8-8b6e-b727e3b9a895")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyInformationalVersion("0.1.0")]
diff --git a/shared/JsonDotNetSerializer.cs b/shared/JsonDotNetSerializer.cs
@@ -0,0 +1,27 @@
+using log4net.ObjectRenderer;
+using Newtonsoft.Json;
+
+namespace log4net.Util.Serializer
+{
+    public class JsonDotNetSerializer : ISerializer, ISerializerFactory
+    {
+        public bool IncludeNullValues { get; set; }
+
+        public object Serialize(object obj)
+        {
+            var settings = new JsonSerializerSettings
+            {
+                NullValueHandling = IncludeNullValues ?
+                    NullValueHandling.Include :
+                    NullValueHandling.Ignore
+            };
+
+            return JsonConvert.SerializeObject(obj, settings);
+        }
+
+        public ISerializer GetSerializer(object obj, RendererMap map)
+        {
+            return this;
+        }
+    }
+}