Updated twitterizer to 2.4.0.26532

Updated Json to 4.0.4
Updated NBuilder to 3.0.1.1

NzbDrone.App.Test/NzbDrone.App.Test.csproj

@@ -33,8 +33,8 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FizzWare.NBuilder">
-      <HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
+    <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

NzbDrone.App.Test/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="FluentAssertions" version="1.6.0" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1" />
+  <package id="NBuilder" version="3.0.1.1" />
   <package id="Ninject" version="2.2.1.4" />
   <package id="NUnit" version="2.5.10.11092" />
 </packages>

NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -37,8 +37,7 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
+      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

NzbDrone.Core.Test/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMoq" version="1.3.1.3" />
   <package id="FluentAssertions" version="1.6.0" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1" />
+  <package id="NBuilder" version="3.0.1.1" />
   <package id="Ninject" version="2.2.1.4" />
   <package id="NLog" version="2.0.0.2000" />
   <package id="NUnit" version="2.5.10.11092" />

NzbDrone.Core/GettingStarted.txt

@@ -0,0 +1,46 @@
+		___        ___ ___  ___  __    __  ___  __    _ _ _   
+		 |  |  | |  |   |  |__  |__) |  / |__  |__)    | | 
+		 |  |/\| |  |   |  |___ |  \ | /_ |___ |  \   _|_|_
+
+Q) Which files do I need?
+A) More than likely, you only need Twitterizer2.dll and Newtonsoft.Json.dll
+
+Q) What exactly are all these files?
+A)
+	Twitterizer2.dll
+		This is the main binary which contains the core class library. This file is required for all addon 
+		libraries.
+
+	Twitterizer2.Data.dll
+		This is an additional library that provides data conversion functionality. 
+		For example, with it you can quickly generate DataTables from any Twitterizer2 collection.
+		This file is not necessary for most projects.
+
+	Newtonsoft.Json.dll
+		This is JSON.NET, developed by James Newton-King. You do not need to add a reference in your 
+		project to this library, but it must be placed in your project's bin folder along with Twitterizer2.dll.
+		More information can be found here: http://james.newtonking.com/pages/json-net.aspx
+
+	Twitterizer2.Async.dll
+		This is an addon library that allows developers to call Twitterizer2 methods asynchronously.
+		This file is not necessary for most projects.
+
+	Twitterizer2.Streaming.dll
+		This is an addon library that provides access to the Streaming API.
+		This file is not necessary for most projects.
+
+	Twitterizer.OAuth.dll
+		This is a standalone library that provides access to our OAuth request signing functionality without 
+		using Twitterizer2. _DO_NOT_ include this file in your project if you are using Twitterizer2.dll. 
+		All of the functionality found in this library is available within Twitterizer2.dll.
+		This file is not necessary for most projects.
+
+	Twitterizer2lite.dll
+		This is a slimmed down version of the Twitterizer2.dll file built with the client profile as the target framework.
+		It will lack some extra pieces of functionality, such as the built-in data caching and support for application 
+		configuration settings.
+		_DO_NOT_ include this file in your project if you are using Twitterizer2.dll. 
+		This file is not necessary for most projects.
+
+Q) What about the license files?
+A) The license files must accompany the dlls. That means that they must be distributed along with your application.

NzbDrone.Core/Json.NET.license.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

NzbDrone.Core/NzbDrone.Core.csproj

@@ -142,6 +142,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Ninject, Version=2.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath>
     </Reference>
@@ -170,8 +173,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\TvdbLib.dll</HintPath>
     </Reference>
-    <Reference Include="Twitterizer2">
-      <HintPath>..\packages\twitterizer.2.3.3\lib\35\Twitterizer2.dll</HintPath>
+    <Reference Include="Twitterizer2, Version=2.4.0.26532, Culture=neutral, PublicKeyToken=69d1469eac671567, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\twitterizer.2.4.0.26532\lib\net40\Twitterizer2.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -357,6 +361,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="GettingStarted.txt" />
+    <Content Include="Json.NET.license.txt" />
     <Content Include="NzbDrone.ico" />
     <Content Include="license.txt" />
   </ItemGroup>

NzbDrone.Core/packages.config

@@ -3,9 +3,9 @@
   <package id="DotNetZip" version="1.9.1.8" />
   <package id="Growl" version="0.6" />
   <package id="MiniProfiler" version="1.9" />
-  <package id="Newtonsoft.Json" version="3.5.8" />
+  <package id="Newtonsoft.Json" version="4.0.4" />
   <package id="Ninject" version="2.2.1.4" />
   <package id="NLog" version="2.0.0.2000" />
   <package id="SqlServerCompact" version="4.0.8482.1" />
-  <package id="twitterizer" version="2.3.3" />
+  <package id="twitterizer" version="2.4.0.26532" />
 </packages>

NzbDrone.Update.Test/NzbDrone.Update.Test.csproj

@@ -38,8 +38,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FizzWare.NBuilder">
-      <HintPath>..\packages\NBuilder.3.0.1\lib\FizzWare.NBuilder.dll</HintPath>
+    <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

NzbDrone.Update.Test/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="1.6.0" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1" />
+  <package id="NBuilder" version="3.0.1.1" />
   <package id="NUnit" version="2.5.10.11092" />
 </packages>

NzbDrone.Update/Program.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Update
             {
                 var enviromentProvider = _kernel.Get<EnviromentProvider>();
                 var diskProvider = _kernel.Get<DiskProvider>();
-                logger.Info("Copying log tiles to application directory.");
+                logger.Info("Copying log files to application directory.");
                 diskProvider.CopyDirectory(enviromentProvider.GetSandboxLogFolder(), enviromentProvider.GetUpdateLogFolder());
             }
             catch (Exception e)

NzbDrone.Web/Web.config

@@ -9,7 +9,7 @@
   </appSettings>
   <system.web>
     <trust level="Full" originUrl=".*" />
-    <compilation debug="true" targetFramework="4.0"/>
+    <compilation debug="true" targetFramework="4.0" />
     <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <controls>
         <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
@@ -49,6 +49,10 @@
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.data>

packages/twitterizer.2.3.3/lib/35/Twitterizer2.license.txt

@@ -1,19 +0,0 @@
-Copyright (c) 2010, Patrick "Ricky" Smith
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- 
- - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the distribution.
-   
- - Neither the name Twitterizer nor the names of its contributors may be used to endorse or promote products derived from 
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

packages/twitterizer.2.4.0.26532/content/GettingStarted.txt

@@ -0,0 +1,46 @@
+		___        ___ ___  ___  __    __  ___  __    _ _ _   
+		 |  |  | |  |   |  |__  |__) |  / |__  |__)    | | 
+		 |  |/\| |  |   |  |___ |  \ | /_ |___ |  \   _|_|_
+
+Q) Which files do I need?
+A) More than likely, you only need Twitterizer2.dll and Newtonsoft.Json.dll
+
+Q) What exactly are all these files?
+A)
+	Twitterizer2.dll
+		This is the main binary which contains the core class library. This file is required for all addon 
+		libraries.
+
+	Twitterizer2.Data.dll
+		This is an additional library that provides data conversion functionality. 
+		For example, with it you can quickly generate DataTables from any Twitterizer2 collection.
+		This file is not necessary for most projects.
+
+	Newtonsoft.Json.dll
+		This is JSON.NET, developed by James Newton-King. You do not need to add a reference in your 
+		project to this library, but it must be placed in your project's bin folder along with Twitterizer2.dll.
+		More information can be found here: http://james.newtonking.com/pages/json-net.aspx
+
+	Twitterizer2.Async.dll
+		This is an addon library that allows developers to call Twitterizer2 methods asynchronously.
+		This file is not necessary for most projects.
+
+	Twitterizer2.Streaming.dll
+		This is an addon library that provides access to the Streaming API.
+		This file is not necessary for most projects.
+
+	Twitterizer.OAuth.dll
+		This is a standalone library that provides access to our OAuth request signing functionality without 
+		using Twitterizer2. _DO_NOT_ include this file in your project if you are using Twitterizer2.dll. 
+		All of the functionality found in this library is available within Twitterizer2.dll.
+		This file is not necessary for most projects.
+
+	Twitterizer2lite.dll
+		This is a slimmed down version of the Twitterizer2.dll file built with the client profile as the target framework.
+		It will lack some extra pieces of functionality, such as the built-in data caching and support for application 
+		configuration settings.
+		_DO_NOT_ include this file in your project if you are using Twitterizer2.dll. 
+		This file is not necessary for most projects.
+
+Q) What about the license files?
+A) The license files must accompany the dlls. That means that they must be distributed along with your application.

packages/twitterizer.2.4.0.26532/content/Json.NET.license.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.