Merge branch 'master' of github.com:loggly/log4net-loggly into add-ha…

…ndling-for-logging-event-properties

Conflicts:
	source/log4net-loggly/LogglyFormatter.cs
	source/log4net-loggly/log4net-loggly.csproj

source/log4net-loggly-console/log4net-loggly-console.csproj

@@ -34,8 +34,8 @@
     <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\net40-client\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net40-client\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

source/log4net-loggly-console/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net40-client" />
+  <package id="log4net" version="2.0.7" targetFramework="net40-client" />
 </packages>

source/log4net-loggly.UnitTests/log4net-loggly.UnitTests.csproj

@@ -51,8 +51,8 @@
       <HintPath>..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />

source/log4net-loggly.UnitTests/packages.config

@@ -4,7 +4,7 @@
   <package id="Castle.Core" version="4.0.0" targetFramework="net461" />
   <package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
   <package id="JetBrains.Annotations" version="10.3.0" targetFramework="net461" />
-  <package id="log4net" version="2.0.3" targetFramework="net461" />
+  <package id="log4net" version="2.0.7" targetFramework="net461" />
   <package id="Moq" version="4.7.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="8.0.1" targetFramework="net461" />
   <package id="xunit" version="2.2.0" targetFramework="net461" />