Upgrade GraphQL and GraphQL-Parser

Author: rasmusjp

src/Our.Umbraco.GraphQL/Our.Umbraco.GraphQL.csproj

@@ -54,11 +54,11 @@
     <Reference Include="Examine, Version=0.1.89.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Examine.0.1.89\lib\net45\Examine.dll</HintPath>
     </Reference>
-    <Reference Include="GraphQL, Version=0.17.3.768, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GraphQL.0.17.3\lib\net45\GraphQL.dll</HintPath>
+    <Reference Include="GraphQL, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GraphQL.2.0.0\lib\net45\GraphQL.dll</HintPath>
     </Reference>
-    <Reference Include="GraphQL-Parser, Version=2.0.0.17, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GraphQL-Parser.2.0.0\lib\net45\GraphQL-Parser.dll</HintPath>
+    <Reference Include="GraphQL-Parser, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GraphQL-Parser.3.0.0\lib\net45\GraphQL-Parser.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HtmlAgilityPack.1.8.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -159,6 +159,15 @@
     <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
+    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
     </Reference>

src/Our.Umbraco.GraphQL/Types/ComplexGraphTypeOfIPublishedContentExtensions.cs

@@ -132,7 +132,7 @@ public static IEnumerable<TSource> Filter<TSource, TParent>(
             if (context.Arguments.TryGetValue("filter", out object filterArg) && filterArg != null)
             {
                 var rootFilter = ((IDictionary<string, object>)filterArg).First();
-                var filterType = (IComplexGraphType)context.FieldDefinition.Arguments.Find(x => x.Name == "filter").ResolvedType;
+                var filterType = (IComplexGraphType)context.FieldDefinition.Arguments.Find("filter").ResolvedType;
                 var filter = ResolveFilter(filterType, rootFilter, context.ParentType, executionContext);
 
                 source = source.Where(x => filter.IsSatisfiedBy(x));

src/Our.Umbraco.GraphQL/Types/UmbracoQuery.cs

@@ -14,7 +14,7 @@ public UmbracoQuery()
                 .Resolve(context =>
                 {
                     var userContext = (UmbracoGraphQLContext)context.UserContext;
-                    var id = context.GetArgument<string>("id");
+                    var id = context.GetArgument<int>("id");
                     return userContext.Umbraco.TypedContent(id);
                 });
 

src/Our.Umbraco.GraphQL/app.config

@@ -70,6 +70,10 @@
         <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

src/Our.Umbraco.GraphQL/packages.config

@@ -4,8 +4,8 @@
   <package id="ClientDependency" version="1.9.6" targetFramework="net462" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net462" />
   <package id="Examine" version="0.1.89" targetFramework="net462" />
-  <package id="GraphQL" version="0.17.3" targetFramework="net462" />
-  <package id="GraphQL-Parser" version="2.0.0" targetFramework="net462" />
+  <package id="GraphQL" version="2.0.0" targetFramework="net462" />
+  <package id="GraphQL-Parser" version="3.0.0" targetFramework="net462" />
   <package id="HtmlAgilityPack" version="1.8.4" targetFramework="net462" />
   <package id="ImageProcessor" version="2.6.1.19" targetFramework="net462" />
   <package id="ImageProcessor.Web" version="4.9.2.19" targetFramework="net462" />
@@ -38,6 +38,9 @@
   <package id="Owin" version="1.0" targetFramework="net462" />
   <package id="semver" version="1.1.2" targetFramework="net462" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net462" />
+  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net462" />
+  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net462" />
+  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net462" />
   <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="UmbracoCms.Core" version="7.10.4" targetFramework="net462" />