Bump GraphQL (#756)

Shane32 · web-flow · commit 47c29870acaa · 2022-03-21T20:51:20.000-04:00
diff --git a/samples/Samples.Schemas.Chat/ChatSubscriptions.cs b/samples/Samples.Schemas.Chat/ChatSubscriptions.cs
@@ -4,7 +4,6 @@
 using System.Security.Claims;
 using GraphQL.Resolvers;
 using GraphQL.Server.Transports.Subscriptions.Abstractions;
-using GraphQL.Subscription;
 using GraphQL.Types;
 
 namespace GraphQL.Samples.Schemas.Chat
@@ -16,15 +15,15 @@ public class ChatSubscriptions : ObjectGraphType<object>
         public ChatSubscriptions(IChat chat)
         {
             _chat = chat;
-            AddField(new EventStreamFieldType
+            AddField(new FieldType
             {
                 Name = "messageAdded",
                 Type = typeof(MessageType),
                 Resolver = new FuncFieldResolver<Message>(ResolveMessage),
                 Subscriber = new EventStreamResolver<Message>(Subscribe)
             });
 
-            AddField(new EventStreamFieldType
+            AddField(new FieldType
             {
                 Name = "messageAddedByUser",
                 Arguments = new QueryArguments(
@@ -36,7 +35,7 @@ public ChatSubscriptions(IChat chat)
             });
         }
 
-        private IObservable<Message> SubscribeById(IResolveEventStreamContext context)
+        private IObservable<Message> SubscribeById(IResolveFieldContext context)
         {
             var messageContext = (MessageHandlingContext)context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
@@ -58,7 +57,7 @@ private Message ResolveMessage(IResolveFieldContext context)
             return message;
         }
 
-        private IObservable<Message> Subscribe(IResolveEventStreamContext context)
+        private IObservable<Message> Subscribe(IResolveFieldContext context)
         {
             var messageContext = (MessageHandlingContext)context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
diff --git a/samples/Samples.Server/Samples.Server.csproj b/samples/Samples.Server/Samples.Server.csproj
@@ -11,9 +11,9 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/All/All.csproj b/src/All/All.csproj
@@ -19,10 +19,10 @@
     <ProjectReference Include="..\Ui.Playground\Ui.Playground.csproj" />
     <ProjectReference Include="..\Ui.Voyager\Ui.Voyager.csproj" />
 
-    <PackageReference Include="GraphQL.MemoryCache" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.MemoryCache" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Authorization.AspNetCore/Authorization.AspNetCore.csproj b/src/Authorization.AspNetCore/Authorization.AspNetCore.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="GraphQL" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL" Version="5.0.0-preview-500" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
@@ -12,8 +12,8 @@
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.19" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" Condition="'$(TargetFramework)' == 'net5'" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.DataLoader" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.DataLoader" Version="5.0.0-preview-500" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
   </ItemGroup>
 
diff --git a/src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj b/src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj
@@ -1,12 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>GraphQL;subscriptions</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-500" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
   </ItemGroup>
diff --git a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
@@ -8,8 +8,8 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj b/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Tests.props" />
 
   <PropertyGroup>
@@ -12,7 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\samples\Samples.Schemas.Chat\Samples.Schemas.Chat.csproj" />
     <ProjectReference Include="..\..\src\Transports.Subscriptions.Abstractions\Transports.Subscriptions.Abstractions.csproj" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj b/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Tests.props" />
 
   <PropertyGroup>
@@ -9,8 +9,8 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <ProjectReference Include="..\..\src\Transports.Subscriptions.WebSockets\Transports.Subscriptions.WebSockets.csproj" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-476" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-476" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-500" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-500" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System.Security.Claims;`
`5`	`5`	`using GraphQL.Resolvers;`
`6`	`6`	`using GraphQL.Server.Transports.Subscriptions.Abstractions;`
`7`		`-using GraphQL.Subscription;`
`8`	`7`	`using GraphQL.Types;`
`9`	`8`
`10`	`9`	`namespace GraphQL.Samples.Schemas.Chat`
`@@ -16,15 +15,15 @@ public class ChatSubscriptions : ObjectGraphType<object>`
`16`	`15`	`public ChatSubscriptions(IChat chat)`
`17`	`16`	`{`
`18`	`17`	`_chat = chat;`
`19`		`- AddField(new EventStreamFieldType`
	`18`	`+ AddField(new FieldType`
`20`	`19`	`{`
`21`	`20`	`Name = "messageAdded",`
`22`	`21`	`Type = typeof(MessageType),`
`23`	`22`	`Resolver = new FuncFieldResolver<Message>(ResolveMessage),`
`24`	`23`	`Subscriber = new EventStreamResolver<Message>(Subscribe)`
`25`	`24`	`});`
`26`	`25`
`27`		`- AddField(new EventStreamFieldType`
	`26`	`+ AddField(new FieldType`
`28`	`27`	`{`
`29`	`28`	`Name = "messageAddedByUser",`
`30`	`29`	`Arguments = new QueryArguments(`
`@@ -36,7 +35,7 @@ public ChatSubscriptions(IChat chat)`
`36`	`35`	`});`
`37`	`36`	`}`
`38`	`37`
`39`		`- private IObservable<Message> SubscribeById(IResolveEventStreamContext context)`
	`38`	`+ private IObservable<Message> SubscribeById(IResolveFieldContext context)`
`40`	`39`	`{`
`41`	`40`	`var messageContext = (MessageHandlingContext)context.UserContext;`
`42`	`41`	`var user = messageContext.Get<ClaimsPrincipal>("user");`
`@@ -58,7 +57,7 @@ private Message ResolveMessage(IResolveFieldContext context)`
`58`	`57`	`return message;`
`59`	`58`	`}`
`60`	`59`
`61`		`- private IObservable<Message> Subscribe(IResolveEventStreamContext context)`
	`60`	`+ private IObservable<Message> Subscribe(IResolveFieldContext context)`
`62`	`61`	`{`
`63`	`62`	`var messageContext = (MessageHandlingContext)context.UserContext;`
`64`	`63`	`var user = messageContext.Get<ClaimsPrincipal>("user");`