From 450d90586dbbed0db2f2c6d75bfa3c00c0ab628e Mon Sep 17 00:00:00 2001
From: Leonardo Galli <leonardo.galli@bluewin.ch>
Date: Fri, 2 Mar 2018 20:04:16 +0100
Subject: [PATCH] Fixed: Messed up merge from Cherry pick

---
 src/.idea/.idea.NzbDrone/riderModule.iml      | 46 +++++--------------
 src/LogentriesNLog/LogentriesNLog.csproj      |  2 -
 src/NzbDrone.Api/NzbDrone.Api.csproj          |  2 -
 src/NzbDrone.Common/NzbDrone.Common.csproj    |  2 -
 src/NzbDrone.Core/NzbDrone.Core.csproj        |  2 -
 .../NzbDrone.Test.Common.csproj               |  2 -
 6 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/src/.idea/.idea.NzbDrone/riderModule.iml b/src/.idea/.idea.NzbDrone/riderModule.iml
index c84a9c732..426ea3371 100644
--- a/src/.idea/.idea.NzbDrone/riderModule.iml
+++ b/src/.idea/.idea.NzbDrone/riderModule.iml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../../../Logo/1024.png">
-      <sourceFolder url="file://$MODULE_DIR$/../../../Logo/1024.png" isTestSource="false" />
-    </content>
     <content url="file://$MODULE_DIR$/../../../Logo/64.png">
       <sourceFolder url="file://$MODULE_DIR$/../../../Logo/64.png" isTestSource="false" />
     </content>
@@ -16,34 +13,33 @@
       <sourceFolder url="file://$MODULE_DIR$/../../Libraries/MediaInfo/libmediainfo.0.dylib" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../Libraries/MediaInfo/MediaInfo.dll" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../Libraries/Sqlite/libsqlite3.0.dylib" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../Libraries/Sqlite/sqlite3.dll" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../LogentriesCore" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../LogentriesNLog" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../Marr.Data" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Core" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Owin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../MonoTorrent" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone/NzbDrone.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Api" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test/NzbDrone.Host.Test.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Common" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Console" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test/NzbDrone.Common.Test.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Console/NzbDrone.Console.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Core" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Host" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test/NzbDrone.Core.Test.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Host/NzbDrone.Host.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono/NzbDrone.Mono.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.SignalR" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update/NzbDrone.Update.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test/NzbDrone.Update.Test.csproj" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows/NzbDrone.Windows.csproj" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceInstall" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceUninstall" isTestSource="false" />
@@ -62,37 +58,19 @@
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Console/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Host/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.SignalR/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows/obj" />
-      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceInstall/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceUninstall/obj" />
       <excludeFolder url="file://$MODULE_DIR$/../../_ReSharper.Caches/ReSharperHost8.NzbDrone.00" />
diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj
index 3e8a3d19a..940d4d730 100644
--- a/src/LogentriesNLog/LogentriesNLog.csproj
+++ b/src/LogentriesNLog/LogentriesNLog.csproj
@@ -51,8 +51,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj
index acf06e85c..c11d15620 100644
--- a/src/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/src/NzbDrone.Api/NzbDrone.Api.csproj
@@ -72,8 +72,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj
index 2ce9b096b..b1854f482 100644
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -43,8 +43,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index d0f8695af..8ea4527f9 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -80,8 +80,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index cff708d51..8190f94f9 100644
--- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -49,8 +49,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
     </Reference>