Support for .NET 3.5 and up.

Author: sblom

src/JsonLD/JsonLD.csproj

@@ -13,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\JsonLD\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +24,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

src/JsonLD/Util/JSONUtils.cs

@@ -4,7 +4,6 @@
 using JsonLD.Util;
 using Newtonsoft.Json;
 using System.Net;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
 namespace JsonLD.Util

src/JsonLD/Util/JavaCompat.cs

@@ -7,7 +7,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace JsonLD
 {
@@ -158,6 +157,14 @@ public static void Reverse<T>(this IList<T> list)
             }
         }
 
+        class JTokenStringCompare : Comparer<JToken>
+        {
+            public override int Compare(JToken x, JToken y)
+            {
+                return string.Compare((string)x, (string)y);
+            }
+        }
+
         public static void SortInPlace<T>(this IList<T> list)
         {
             if (list is List<T>)
@@ -168,8 +175,10 @@ public static void SortInPlace<T>(this IList<T> list)
             {
                 // TODO(sblom): This is really awful; figure out how to really sort a JArray in place.
                 JArray arr = (JArray)list;
-                var tmp = new List<JToken>((JArray)list);
-                tmp.Sort(Comparer<JToken>.Create((s,t) => string.Compare((string)s,(string)t)));
+                // .Select(x => x) is a workaround for .NET 3.5's List constructor's failure to
+                // disbelieve Newtonsoft.Json when IJCollection.Count returns 0.
+                List<JToken> tmp = arr.Select(x => x).ToList();
+                tmp.Sort(new JTokenStringCompare());
                 arr.RemoveAll();
                 foreach (var t in tmp)
                 {
@@ -193,7 +202,9 @@ public static void SortInPlace<T>(this IList<T> list, IComparer<T> cmp)
                 // TODO(sblom): This is really awful; figure out how to really sort a JArray in place.
                 JArray arr = (JArray)list;
                 IComparer<JToken> comparer = (IComparer<JToken>)cmp;
-                var tmp = new List<JToken>((JArray)list);
+                // .Select(x => x) is a workaround for .NET 3.5's List constructor's failure to
+                // disbelieve Newtonsoft.Json when IJCollection.Count returns 0.
+                var tmp = arr.Select(x => x).ToList();
                 tmp.Sort(comparer);
                 tmp.Select((t, i) => arr[i] = tmp[i]);
             }

tests/JsonLD.Test/ConformanceTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 using Newtonsoft.Json.Linq;
 using Xunit;
@@ -22,11 +21,11 @@ public void ConformanceTestPasses(string id, string testname, ConformanceCase co
             JToken result = conformanceCase.run();
             if (id.Contains("error"))
             {
-                Assert.True(((string)result["error"]).StartsWith((string)conformanceCase.error), "errors don't match");
+                Assert.True(((string)result["error"]).StartsWith((string)conformanceCase.error), "Resulting error doesn't match expectations.");
             }
             else
             {
-                Assert.True(JsonLdUtils.DeepCompare(result, conformanceCase.output), "returned JSON matches expectations");
+                Assert.True(JsonLdUtils.DeepCompare(result, conformanceCase.output), "Returned JSON doesn't match expectations.");
             }
         }
     }

tests/JsonLD.Test/JsonLD.Test.csproj

@@ -13,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">