move Ports into internal namespace; Update JSON.NET

2013-10-17 12:49:52 +02:00
parent 649ded199d
commit 1c74d6ebf4
25 changed files with 27 additions and 28 deletions
@@ -1,4 +1,4 @@
-using NReadability;
+using PocketSharp.Ports.NReadability;
 using System;
 using System.Net;
 using System.Net.Http;
@@ -77,9 +77,6 @@
    <Reference Include="Microsoft.Threading.Tasks.Extensions">
      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
-    </Reference>
    <Reference Include="System.IO">
      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.IO.dll</HintPath>
    </Reference>
@@ -4,5 +4,5 @@
  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="portable-net45+sl40+wp71+win" />
  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="portable-net45+sl40+wp71+win" />
  <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="portable-net403+sl40+wp71+win" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="portable-net403+sl40+wp71+win" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="portable-net45+sl40+wp71+win" />
 </packages>
@@ -1,6 +1,6 @@
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class AttributeTransformationInput
  {
@@ -1,4 +1,4 @@
-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class AttributeTransformationResult
  {
@@ -21,7 +21,7 @@
 using System;
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  internal class ChildNodesTraverser
  {
@@ -1,6 +1,6 @@
 using System.Reflection;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public static class Consts
  {
@@ -24,7 +24,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public static class DomExtensions
  {
@@ -1,6 +1,6 @@
 using System;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class DomSerializationParams
  {
@@ -21,7 +21,7 @@
 using System;
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class ElementsTraverser
  {
@@ -22,7 +22,7 @@ using System;
 using System.IO;
 using System.Text;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  internal class EncodedStringWriter : StringWriter
  {
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public static class EnumerableExtensions
  {
@@ -18,7 +18,7 @@
 * limitations under the License.
 */

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  /// <summary>
  /// Determines how the extracted article will be styled.
@@ -1,6 +1,6 @@
 using System;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public static class HtmlUtils
  {
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  /// <summary>
  /// An exception that is thrown when an internal error occurrs in the application.
@@ -28,7 +28,7 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  /// <summary>
  /// A class that extracts main content from a HTML page.
@@ -23,10 +23,10 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Linq;
-using Sgml;
+using PocketSharp.Ports.Sgml;
 using System.IO;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  /// <summary>
  /// A class for constructing a DOM from HTML markup.
@@ -22,7 +22,7 @@ using System;
 using System.Linq;
 using System.Xml.Linq;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  /// <summary>
  /// A class for serializing a DOM to string.
@@ -1,6 +1,6 @@
 using System;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class TranscodingInput
  {
@@ -1,5 +1,7 @@
+using System;
 using System.Xml.Linq;
-namespace NReadability
+
+namespace PocketSharp.Ports.NReadability
 {
  public class TranscodingResult
  {
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  internal static class UtilityExtensions
  {
@@ -1,6 +1,6 @@
 using System;

-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class WebTranscodingInput
  {
@@ -1,4 +1,4 @@
-namespace NReadability
+namespace PocketSharp.Ports.NReadability
 {
  public class WebTranscodingResult
  {
@@ -31,7 +31,7 @@ using System.Text;
 using System.Threading;
 using System.Xml;

-namespace Sgml {
+namespace PocketSharp.Ports.Sgml {
    /// <summary>
    /// Thrown if any errors occur while parsing the source.
    /// </summary>
@@ -40,7 +40,7 @@ using System.Reflection;
 using System.Text;
 using System.Xml;

-namespace Sgml
+namespace PocketSharp.Ports.Sgml
 {
    /// <summary>
    /// SGML is case insensitive, so here you can choose between converting