Merge pull request github#6145 from tamasvajk/feature/stub-jsonnet

C#: Change Newtonsoft.Json stub to nuget-based one

Author: tamasvajk

csharp/ql/test/library-tests/frameworks/JsonNET/Json.cs

@@ -1,4 +1,4 @@
-// semmle-extractor-options: ${testdir}/../../../resources/stubs/JsonNET.cs /r:System.Linq.dll
+// semmle-extractor-options: /nostdlib /noconfig --load-sources-from-project:../../../resources/stubs/Newtonsoft.Json/13.0.1/Newtonsoft.Json.csproj
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -47,14 +47,14 @@ void F()
             Sink((string)jobject["1"]["2"]);
 
             // Linq JToken tests
-            Sink(jobject.First(i => true));
+            Sink(jobject.First((JToken i) => true));
             Sink(jobject["2"].First(i => true));
             Sink(jobject["2"]["3"].First(i => true));
             Sink(jobject.SelectToken("Manufacturers[0].Name"));
 
             JObject untaintedJObject = JObject.Parse(u);
             Sink(untaintedJObject);
-            Sink(untaintedJObject.First(i => true));
+            Sink(untaintedJObject.First((JToken i) => true));
         }
 
         public class Object
@@ -64,7 +64,7 @@ public class Object
             [JsonIgnore]
             public int untainted;
 
-            public Dictionary<string,string> taintedValues;
+            public Dictionary<string, string> taintedValues;
 
             public string[] taintedArray;
         }

csharp/ql/test/library-tests/frameworks/JsonNET/Json.expected

@@ -9,7 +9,7 @@
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:45:18:45:29 | access to indexer |
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:46:18:46:34 | access to indexer |
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:47:18:47:42 | call to operator explicit conversion |
-| Json.cs:18:24:18:32 | "tainted" | Json.cs:50:18:50:41 | call to method First |
+| Json.cs:18:24:18:32 | "tainted" | Json.cs:50:18:50:50 | call to method First |
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:51:18:51:46 | call to method First |
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:52:18:52:51 | call to method First |
 | Json.cs:18:24:18:32 | "tainted" | Json.cs:53:18:53:61 | call to method SelectToken |