From 0b727e70cb02812492c964a694ade7338d055e5a Mon Sep 17 00:00:00 2001
From: Jason Finch <jason.finch@gmail.com>
Date: Thu, 16 Jan 2014 13:04:33 +1000
Subject: [PATCH] NLog upgraded from 2.0 to 2.1

---
 LoggingExtensions.NLog.Sample/App.config      | 35 ++++++++-----------
 .../LoggingExtensions.NLog.Sample.csproj      | 20 ++++++-----
 LoggingExtensions.NLog.Sample/packages.config |  2 +-
 .../LoggingExtensions.NLog.VB.Sample.vbproj   |  5 +--
 LoggingExtensions.NLog.VB.Sample/app.config   | 35 ++++++++-----------
 .../packages.config                           |  2 +-
 .../LoggingExtensions.NLog.csproj             |  5 +--
 LoggingExtensions.NLog/packages.config        |  2 +-
 .../LoggingExtensions.Tests.csproj            |  5 +--
 LoggingExtensions.Tests/packages.config       |  2 +-
 LoggingExtensions.sln                         |  3 ++
 11 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/LoggingExtensions.NLog.Sample/App.config b/LoggingExtensions.NLog.Sample/App.config
index 2c80f42..96c26be 100644
--- a/LoggingExtensions.NLog.Sample/App.config
+++ b/LoggingExtensions.NLog.Sample/App.config
@@ -1,28 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
+    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
   </configSections>
   <nlog>
     <targets>
-      <target name="console" type="Console"
-              layout="${message}"
-              />
-      <target name="file" type="AsyncWrapper"
-            queueLimit="5000"
-            overflowAction="Discard">
-        <target type="File"
-              fileName="${basedir}/logs/this.Log-NLog.Sample.log"
-              layout="${longdate} ${threadid} [${level:uppercase=true}] ${message}"
-              />
+      <target name="console" type="Console" layout="${message}" />
+      <target name="file" type="AsyncWrapper" queueLimit="5000" overflowAction="Discard">
+        <target type="File" fileName="${basedir}/logs/this.Log-NLog.Sample.log" layout="${longdate} ${threadid} [${level:uppercase=true}] ${message}" />
       </target>
-      <target name="errorSmtp" type="Mail"
-           layout="${longdate} ${threadid} [${level:uppercase=true}] ${logger} - ${message}"
-           subject="this.Log Sample Console Errors - LOCAL DEBUG"
-           to="noone@noreply.org"
-           from="this.Log.sample@noreply.org"
-           smtpServer="localhost"
-             />
+      <target name="errorSmtp" type="Mail" layout="${longdate} ${threadid} [${level:uppercase=true}] ${logger} - ${message}" subject="this.Log Sample Console Errors - LOCAL DEBUG" to="noone@noreply.org" from="this.Log.sample@noreply.org" smtpServer="localhost" />
     </targets>
 
     <rules>
@@ -32,6 +19,14 @@
     </rules>
   </nlog>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/LoggingExtensions.NLog.Sample/LoggingExtensions.NLog.Sample.csproj b/LoggingExtensions.NLog.Sample/LoggingExtensions.NLog.Sample.csproj
index 501a56f..0d08778 100644
--- a/LoggingExtensions.NLog.Sample/LoggingExtensions.NLog.Sample.csproj
+++ b/LoggingExtensions.NLog.Sample/LoggingExtensions.NLog.Sample.csproj
@@ -54,18 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="this.Log, Version=0.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\this.Log.0.0.2.0\lib\net40\this.Log.dll</HintPath>
-    </Reference>
-    <Reference Include="this.Log-NLog, Version=0.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\this.Log-NLog.0.0.2.0\lib\net40\this.Log-NLog.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssembly.cs">
@@ -110,6 +102,16 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LoggingExtensions.Core\LoggingExtensions.Core.csproj">
+      <Project>{F61EB8DD-2E99-4E3B-96F0-8015FC6FB880}</Project>
+      <Name>LoggingExtensions.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\LoggingExtensions.NLog\LoggingExtensions.NLog.csproj">
+      <Project>{E045C968-1B32-493F-A3C1-B428A2789F44}</Project>
+      <Name>LoggingExtensions.NLog</Name>
+    </ProjectReference>
+  </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.
diff --git a/LoggingExtensions.NLog.Sample/packages.config b/LoggingExtensions.NLog.Sample/packages.config
index 4b843e1..fa3dd50 100644
--- a/LoggingExtensions.NLog.Sample/packages.config
+++ b/LoggingExtensions.NLog.Sample/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="2.0.0.2000" targetFramework="net40" />
+  <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="this.Log" version="0.0.2.0" targetFramework="net40" />
   <package id="this.Log-NLog" version="0.0.2.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/LoggingExtensions.NLog.VB.Sample/LoggingExtensions.NLog.VB.Sample.vbproj b/LoggingExtensions.NLog.VB.Sample/LoggingExtensions.NLog.VB.Sample.vbproj
index 9d0de92..ee1462a 100644
--- a/LoggingExtensions.NLog.VB.Sample/LoggingExtensions.NLog.VB.Sample.vbproj
+++ b/LoggingExtensions.NLog.VB.Sample/LoggingExtensions.NLog.VB.Sample.vbproj
@@ -72,8 +72,9 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/LoggingExtensions.NLog.VB.Sample/app.config b/LoggingExtensions.NLog.VB.Sample/app.config
index d98d6f9..95edee5 100644
--- a/LoggingExtensions.NLog.VB.Sample/app.config
+++ b/LoggingExtensions.NLog.VB.Sample/app.config
@@ -1,28 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
+    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
   </configSections>
   <nlog>
     <targets>
-      <target name="console" type="Console" 
-              layout="${message}" 
-              />
-      <target name="file" type="AsyncWrapper" 
-            queueLimit="5000" 
-            overflowAction="Discard">
-        <target type="File" 
-              fileName="${basedir}/logs/this.Log-NLog.Sample.log" 
-              layout="${longdate} ${threadid} [${level:uppercase=true}] ${message}" 
-              />
+      <target name="console" type="Console" layout="${message}" />
+      <target name="file" type="AsyncWrapper" queueLimit="5000" overflowAction="Discard">
+        <target type="File" fileName="${basedir}/logs/this.Log-NLog.Sample.log" layout="${longdate} ${threadid} [${level:uppercase=true}] ${message}" />
       </target>
-     <target name="errorSmtp" type="Mail"
-          layout="${longdate} ${threadid} [${level:uppercase=true}] ${logger} - ${message}"
-          subject="this.Log Sample Console Errors - LOCAL DEBUG"
-          to="noone@noreply.org"
-          from="this.Log.sample@noreply.org"
-          smtpServer="localhost" 
-             />
+     <target name="errorSmtp" type="Mail" layout="${longdate} ${threadid} [${level:uppercase=true}] ${logger} - ${message}" subject="this.Log Sample Console Errors - LOCAL DEBUG" to="noone@noreply.org" from="this.Log.sample@noreply.org" smtpServer="localhost" />
     </targets>
     
     <rules>
@@ -32,6 +19,14 @@
     </rules>
   </nlog>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/LoggingExtensions.NLog.VB.Sample/packages.config b/LoggingExtensions.NLog.VB.Sample/packages.config
index 4b843e1..fa3dd50 100644
--- a/LoggingExtensions.NLog.VB.Sample/packages.config
+++ b/LoggingExtensions.NLog.VB.Sample/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="2.0.0.2000" targetFramework="net40" />
+  <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="this.Log" version="0.0.2.0" targetFramework="net40" />
   <package id="this.Log-NLog" version="0.0.2.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/LoggingExtensions.NLog/LoggingExtensions.NLog.csproj b/LoggingExtensions.NLog/LoggingExtensions.NLog.csproj
index 13e6008..adc1e80 100644
--- a/LoggingExtensions.NLog/LoggingExtensions.NLog.csproj
+++ b/LoggingExtensions.NLog/LoggingExtensions.NLog.csproj
@@ -37,8 +37,9 @@
     <AssemblyOriginatorKeyFile>..\LoggingExtensions.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/LoggingExtensions.NLog/packages.config b/LoggingExtensions.NLog/packages.config
index 5ae7a16..9e23c79 100644
--- a/LoggingExtensions.NLog/packages.config
+++ b/LoggingExtensions.NLog/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="2.0.0.2000" targetFramework="net40" />
+  <package id="NLog" version="2.1.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/LoggingExtensions.Tests/LoggingExtensions.Tests.csproj b/LoggingExtensions.Tests/LoggingExtensions.Tests.csproj
index 97fd92f..08510a4 100644
--- a/LoggingExtensions.Tests/LoggingExtensions.Tests.csproj
+++ b/LoggingExtensions.Tests/LoggingExtensions.Tests.csproj
@@ -38,8 +38,9 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
diff --git a/LoggingExtensions.Tests/packages.config b/LoggingExtensions.Tests/packages.config
index 70b6c2d..f474cc2 100644
--- a/LoggingExtensions.Tests/packages.config
+++ b/LoggingExtensions.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="log4net" version="1.2.10" targetFramework="net40" allowedVersions="[1.2.10]" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="NLog" version="2.0.0.2000" targetFramework="net40" />
+  <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net40" />
   <package id="Should" version="1.1.12.0" targetFramework="net40" />
   <package id="TinySpec.NUnit" version="0.9.5" targetFramework="net40" />
diff --git a/LoggingExtensions.sln b/LoggingExtensions.sln
index fff82bf..e63ca41 100644
--- a/LoggingExtensions.sln
+++ b/LoggingExtensions.sln
@@ -26,6 +26,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLog", "NLog", "{83D83031-665E-432D-8A5D-C8A11218C380}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoggingExtensions.NLog.Sample", "LoggingExtensions.NLog.Sample\LoggingExtensions.NLog.Sample.csproj", "{431975AF-1775-4999-A733-D9B206BEFBB9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E045C968-1B32-493F-A3C1-B428A2789F44} = {E045C968-1B32-493F-A3C1-B428A2789F44}
+	EndProjectSection
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LoggingExtensions.NLog.VB.Sample", "LoggingExtensions.NLog.VB.Sample\LoggingExtensions.NLog.VB.Sample.vbproj", "{CEC058B6-EEEF-4C60-A1A3-C607A7B5B3EB}"
 EndProject