From 6e8d41779a6d0f2f66cb512575961df1c0d055a6 Mon Sep 17 00:00:00 2001 From: Bruno Belchior Date: Mon, 13 Feb 2023 17:56:30 -0300 Subject: [PATCH 1/2] Update to .Net 7 --- CommanderGQL.csproj | 14 ++++----- Program.cs | 55 ++++++++++++++++++++------------- Startup.cs | 75 --------------------------------------------- 3 files changed, 40 insertions(+), 104 deletions(-) delete mode 100644 Startup.cs diff --git a/CommanderGQL.csproj b/CommanderGQL.csproj index e201e59..35a812d 100644 --- a/CommanderGQL.csproj +++ b/CommanderGQL.csproj @@ -1,18 +1,18 @@ - net5.0 + net7.0 - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + \ No newline at end of file diff --git a/Program.cs b/Program.cs index d5f2a33..59a3be3 100644 --- a/Program.cs +++ b/Program.cs @@ -1,26 +1,37 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; +using CommanderGQL.Data; +using CommanderGQL.GraphQL; +using GraphQL.Server.Ui.Voyager; +using Microsoft.AspNetCore.Builder; +using CommanderGQL.GraphQL.Commands; +using Microsoft.EntityFrameworkCore; +using CommanderGQL.GraphQL.Platforms; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; -namespace CommanderGQL +var builder = WebApplication.CreateBuilder(args); +builder.Services.AddPooledDbContextFactory(opt => + opt.UseSqlServer(builder.Configuration.GetConnectionString("CommandConStr"))); +builder.Services + .AddGraphQLServer() + .AddQueryType() + .AddMutationType() + .AddSubscriptionType() + .AddType() + .AddType() + .AddFiltering() + .AddSorting() + .AddInMemorySubscriptions(); + +var app = builder.Build(); +app.UseWebSockets(); +app.UseRouting(); +app.UseEndpoints(endpoints => +{ + endpoints.MapGraphQL(); +}); +app.UseGraphQLVoyager("/graphql-voyager", new VoyagerOptions() { - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + GraphQLEndPoint = "/graphql" +}); - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} +app.Run(); \ No newline at end of file diff --git a/Startup.cs b/Startup.cs deleted file mode 100644 index 4a31882..0000000 --- a/Startup.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using CommanderGQL.Data; -using CommanderGQL.GraphQL; -using CommanderGQL.GraphQL.Commands; -using CommanderGQL.GraphQL.Platforms; -using GraphQL.Server.Ui.Voyager; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace CommanderGQL -{ - public class Startup - { - private readonly IConfiguration Configuration; - - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public void ConfigureServices(IServiceCollection services) - { - services.AddPooledDbContextFactory(opt => opt.UseSqlServer - (Configuration.GetConnectionString("CommandConStr"))); - - services - .AddGraphQLServer() - .AddQueryType() - .AddMutationType() - .AddSubscriptionType() - .AddType() - .AddType() - .AddType() - .AddType() - .AddType() - .AddType() - .AddFiltering() - .AddSorting() - .AddInMemorySubscriptions(); - - } - - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseWebSockets(); - - app.UseRouting(); - - app.UseEndpoints(endpoints => - { - endpoints.MapGraphQL(); - }); - - app.UseGraphQLVoyager(new GraphQLVoyagerOptions() - { - GraphQLEndPoint = "/graphql", - Path = "/graphql-voyager" - }); - } - } -} From 3e235afcdbfb17135f49e362a50118c256c60441 Mon Sep 17 00:00:00 2001 From: Bruno Belchior Date: Mon, 13 Feb 2023 17:57:33 -0300 Subject: [PATCH 2/2] Add debug info when IsDevelopment is true. --- Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Program.cs b/Program.cs index 59a3be3..1ebe11b 100644 --- a/Program.cs +++ b/Program.cs @@ -1,6 +1,7 @@ using CommanderGQL.Data; using CommanderGQL.GraphQL; using GraphQL.Server.Ui.Voyager; +using Microsoft.Extensions.Hosting; using Microsoft.AspNetCore.Builder; using CommanderGQL.GraphQL.Commands; using Microsoft.EntityFrameworkCore; @@ -16,6 +17,7 @@ .AddQueryType() .AddMutationType() .AddSubscriptionType() + .ModifyRequestOptions(opt => opt.IncludeExceptionDetails = builder.Environment.IsDevelopment()) .AddType() .AddType() .AddFiltering()