Skip to content

Commit d4c2a9b

Browse files
authored
Upgrade examples (#38)
1 parent e127634 commit d4c2a9b

File tree

17 files changed

+297
-304
lines changed

17 files changed

+297
-304
lines changed

src/AspNetCore/Example/Example.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.5.0-alpha0041" />
11-
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="3.5.0-alpha0041" />
10+
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="3.5.0-alpha0060" />
11+
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="3.5.0-alpha0060" />
1212
<PackageReference Include="Microsoft.AspNetCore.All" />
1313
</ItemGroup>
1414

src/AspNetCore/Example/Startup.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ public void ConfigureServices(IServiceCollection services)
2626
services.AddLogging(builder => builder.AddConsole());
2727
services.AddHttpContextAccessor();
2828

29-
services.AddGraphQL(_ =>
29+
services.AddGraphQL(options =>
3030
{
31-
_.EnableMetrics = true;
32-
_.ExposeExceptions = true;
31+
options.EnableMetrics = true;
32+
options.ExposeExceptions = true;
3333
})
34+
.AddNewtonsoftJson() // or use AddSystemTextJson for .NET Core 3+
3435
.AddUserContextBuilder(httpContext => new GraphQLUserContext { User = httpContext.User });
3536
}
3637

src/AspNetCoreCustom/Example/Example.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
@@ -7,6 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="3.5.0-alpha0060" />
1011
<PackageReference Include="Microsoft.AspNetCore.All" />
1112
</ItemGroup>
1213

src/AspNetCoreCustom/Example/GraphQLMiddleware.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using GraphQL;
2-
using GraphQL.Http;
32
using GraphQL.Instrumentation;
3+
using GraphQL.NewtonsoftJson;
44
using GraphQL.Types;
55
using GraphQL.Validation;
66
using Microsoft.AspNetCore.Http;

src/AspNetCoreCustom/Example/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using GraphQL;
2-
using GraphQL.Http;
32
using GraphQL.Types;
43
using Microsoft.AspNetCore.Builder;
54
using Microsoft.AspNetCore.Hosting;
@@ -15,7 +14,7 @@ public class Startup
1514
public void ConfigureServices(IServiceCollection services)
1615
{
1716
services.AddSingleton<IDocumentExecuter, DocumentExecuter>();
18-
services.AddSingleton<IDocumentWriter, DocumentWriter>();
17+
services.AddSingleton<IDocumentWriter, GraphQL.NewtonsoftJson.DocumentWriter>();
1918

2019
services.AddSingleton<StarWarsData>();
2120
services.AddSingleton<StarWarsQuery>();

src/AspNetWebApi/WebApi/Bootstrapper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using GraphQL;
2-
using GraphQL.Http;
32
using GraphQL.Types;
43
using IoC;
54
using StarWars;
@@ -20,7 +19,7 @@ private ISimpleContainer BuildContainer()
2019
{
2120
var container = new SimpleContainer();
2221
container.Singleton<IDocumentExecuter>(new DocumentExecuter());
23-
container.Singleton<IDocumentWriter>(new DocumentWriter(true));
22+
container.Singleton<IDocumentWriter>(new GraphQL.NewtonsoftJson.DocumentWriter(true));
2423

2524
container.Singleton(new StarWarsData());
2625
container.Register<StarWarsQuery>();

src/AspNetWebApi/WebApi/Controllers/GraphQLController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using GraphQL.Http;
21
using GraphQL.Instrumentation;
2+
using GraphQL.NewtonsoftJson;
33
using GraphQL.Types;
44
using GraphQL.Validation.Complexity;
55
using System.Net;

src/AspNetWebApi/WebApi/Web.config

Lines changed: 256 additions & 276 deletions
Large diffs are not rendered by default.

src/AspNetWebApi/WebApi/WebApi.csproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -45,18 +45,21 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Reference Include="GraphQL, Version=3.0.0.1357, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\GraphQL.3.0.0-preview-1357\lib\netstandard2.0\GraphQL.dll</HintPath>
48+
<Reference Include="GraphQL, Version=3.0.0.1558, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\GraphQL.3.0.0-preview-1558\lib\netstandard2.0\GraphQL.dll</HintPath>
5050
</Reference>
51-
<Reference Include="GraphQL-Parser, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\GraphQL-Parser.4.2.0\lib\netstandard2.0\GraphQL-Parser.dll</HintPath>
51+
<Reference Include="GraphQL-Parser, Version=5.0.1.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\GraphQL-Parser.5.0.1\lib\netstandard2.0\GraphQL-Parser.dll</HintPath>
53+
</Reference>
54+
<Reference Include="GraphQL.NewtonsoftJson, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\GraphQL.NewtonsoftJson.3.0.0-preview-1558\lib\netstandard2.0\GraphQL.NewtonsoftJson.dll</HintPath>
5356
</Reference>
5457
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5558
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
5659
</Reference>
5760
<Reference Include="Microsoft.CSharp" />
5861
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
62+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6063
</Reference>
6164
<Reference Include="System" />
6265
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -234,4 +237,4 @@
234237
</Target>
235238
<Target Name="AfterBuild">
236239
</Target> -->
237-
</Project>
240+
</Project>

src/AspNetWebApi/WebApi/packages.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
4-
<package id="GraphQL" version="3.0.0-preview-1282" targetFramework="net461" />
5-
<package id="GraphQL-Parser" version="4.1.1" targetFramework="net461" />
4+
<package id="GraphQL" version="3.0.0-preview-1558" targetFramework="net461" />
5+
<package id="GraphQL.NewtonsoftJson" version="3.0.0-preview-1558" targetFramework="net461" />
6+
<package id="GraphQL-Parser" version="5.0.1" targetFramework="net461" />
67
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
78
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
89
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
@@ -15,7 +16,7 @@
1516
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net461" />
1617
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net461" />
1718
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
18-
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
19+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
1920
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
2021
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
2122
<package id="System.Reactive" version="4.1.6" targetFramework="net461" />

0 commit comments

Comments
 (0)