From fb1d3a9e92c645e33b37d01b8fb444bb317ba830 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Tue, 17 May 2016 21:21:42 +0100
Subject: [PATCH] Fixed

---
 .../PlexRequests.Api.Interfaces.csproj             | 13 +++++++------
 PlexRequests.Api/PlexApi.cs                        |  2 +-
 PlexRequests.Api/PlexRequests.Api.csproj           |  7 ++++---
 PlexRequests.Api/RetryHandler.cs                   |  4 ++--
 PlexRequests.Api/app.config                        |  8 ++++----
 PlexRequests.Core.Tests/app.config                 |  8 ++++----
 PlexRequests.Core/app.config                       |  8 ++++----
 PlexRequests.Store/SqlTables.sql                   |  2 +-
 PlexRequests.UI/Modules/AdminModule.cs             |  2 +-
 PlexRequests.UI/PlexRequests.UI.csproj             | 14 +++++---------
 PlexRequests.UI/packages.config                    |  4 ++--
 PlexRequests.Updater/PlexRequests.Updater.csproj   |  5 ++++-
 PlexRequests.Updater/app.config                    | 11 +++++++++++
 13 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 PlexRequests.Updater/app.config

diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
index 62fc2658d..3b3321ec6 100644
--- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
+++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -39,9 +43,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="RestSharp">
-      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IApiRequest.cs" />
@@ -55,15 +56,15 @@
     <Compile Include="ISonarrApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
       <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
       <Name>PlexRequests.Api.Models</Name>
     </ProjectReference>
   </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.
diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs
index 1b20a68e9..a58316b7d 100644
--- a/PlexRequests.Api/PlexApi.cs
+++ b/PlexRequests.Api/PlexApi.cs
@@ -96,7 +96,7 @@ namespace PlexRequests.Api
 
             AddHeaders(ref request, authToken);
 
-			var users = RetryHandler.Execute<PlexFriends>(() => Api.Execute<PlexFriends> (request, new Uri(FriendsUri)),
+			var users = RetryHandler.Execute(() => Api.ExecuteXml<PlexFriends> (request, new Uri(FriendsUri)),
 				null,
 				(exception, timespan) => Log.Error (exception, "Exception when calling GetUsers for Plex, Retrying {0}", timespan));
 			
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 0886cc72b..b1f9e1391 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -57,9 +61,6 @@
     <Reference Include="Polly">
       <HintPath>..\packages\Polly-Signed.4.2.0\lib\net45\Polly.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp">
-      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
diff --git a/PlexRequests.Api/RetryHandler.cs b/PlexRequests.Api/RetryHandler.cs
index c9e336f9e..c461b26e0 100644
--- a/PlexRequests.Api/RetryHandler.cs
+++ b/PlexRequests.Api/RetryHandler.cs
@@ -8,7 +8,7 @@ namespace PlexRequests.Api
 	public static class RetryHandler
 	{
 
-		private static TimeSpan[] DefaultTime = new TimeSpan[] { 
+		private static readonly TimeSpan[] DefaultTime = new TimeSpan[] { 
 			TimeSpan.FromSeconds (2),
 			TimeSpan.FromSeconds(5),
 			TimeSpan.FromSeconds(10)};
@@ -44,7 +44,7 @@ namespace PlexRequests.Api
 				timeSpan = DefaultTime;
 			}
 			var policy = Policy.Handle<Exception> ()
-				.WaitAndRetry(timeSpan, (exception, ts) => action(exception, ts));
+				.WaitAndRetry(timeSpan, action);
 
 			return policy;
 		}
diff --git a/PlexRequests.Api/app.config b/PlexRequests.Api/app.config
index 0404cdcb4..44b249bff 100644
--- a/PlexRequests.Api/app.config
+++ b/PlexRequests.Api/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/PlexRequests.Core.Tests/app.config b/PlexRequests.Core.Tests/app.config
index 0404cdcb4..44b249bff 100644
--- a/PlexRequests.Core.Tests/app.config
+++ b/PlexRequests.Core.Tests/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/PlexRequests.Core/app.config b/PlexRequests.Core/app.config
index 0404cdcb4..44b249bff 100644
--- a/PlexRequests.Core/app.config
+++ b/PlexRequests.Core/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index 842bffa29..31db785b8 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS Audit
     Username							varchar(100) NOT NULL,
     ChangeType							varchar(100) NOT NULL,
     OldValue							varchar(100),
-     NewValue							varchar(100),
+     NewValue							varchar(100)
 );
 CREATE UNIQUE INDEX IF NOT EXISTS Audit_Id ON Audit (Id);
 
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index e7dbbdc49..38b830ead 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -221,7 +221,7 @@ namespace PlexRequests.UI.Modules
 			}
 
 			if (!string.IsNullOrWhiteSpace (model.BaseUrl)) {
-				if (model.BaseUrl.StartsWith ("/") || model.BaseUrl.StartsWith ("\\"));
+				if (model.BaseUrl.StartsWith ("/") || model.BaseUrl.StartsWith ("\\"))
 				{
 					model.BaseUrl = model.BaseUrl.Remove (0, 1);
 				}
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index d78195670..d7983017c 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -53,6 +53,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -130,12 +134,6 @@
     <Reference Include="Quartz, Version=2.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4">
       <HintPath>..\packages\Quartz.2.3.3\lib\net40\Quartz.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net46\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
     </Reference>
@@ -471,7 +469,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Views\UserManagement\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/PlexRequests.UI/packages.config b/PlexRequests.UI/packages.config
index 85b9b4822..79419632f 100644
--- a/PlexRequests.UI/packages.config
+++ b/PlexRequests.UI/packages.config
@@ -25,9 +25,9 @@
   <package id="NLog.Schema" version="4.0.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="Quartz" version="2.3.3" targetFramework="net45" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net45"  />
+  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
   <package id="System.Collections" version="4.0.0" targetFramework="net45" />
-  <package id="System.Data.SQLite.Core" version="1.0.99.0" targetFramework="net45"  />
+  <package id="System.Data.SQLite.Core" version="1.0.99.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net45" />
   <package id="System.Globalization" version="4.0.0" targetFramework="net45" />
   <package id="System.Linq" version="4.0.0" targetFramework="net45" />
diff --git a/PlexRequests.Updater/PlexRequests.Updater.csproj b/PlexRequests.Updater/PlexRequests.Updater.csproj
index c7a2ef5a5..433553dc8 100644
--- a/PlexRequests.Updater/PlexRequests.Updater.csproj
+++ b/PlexRequests.Updater/PlexRequests.Updater.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -48,4 +48,7 @@
       <Name>PlexRequests.Helpers</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/PlexRequests.Updater/app.config b/PlexRequests.Updater/app.config
new file mode 100644
index 000000000..de5386a47
--- /dev/null
+++ b/PlexRequests.Updater/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file