From d834c9fa0d02ece961f2d1bfd49dc8fef2161eba Mon Sep 17 00:00:00 2001
From: Joe McBride <joe@uicraftsman.com>
Date: Wed, 15 Aug 2018 07:55:29 -0700
Subject: [PATCH] Bump to 2.0 release

---
 .../GraphQL.Authorization.csproj               |  2 +-
 src/Harness/Harness.csproj                     |  6 +++---
 src/Harness/Startup.cs                         | 18 +++++++-----------
 tools/tasks/settings.js                        |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/GraphQL.Authorization/GraphQL.Authorization.csproj b/src/GraphQL.Authorization/GraphQL.Authorization.csproj
index 0693556..99674ea 100644
--- a/src/GraphQL.Authorization/GraphQL.Authorization.csproj
+++ b/src/GraphQL.Authorization/GraphQL.Authorization.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="2.0.0-alpha-912" />
+    <PackageReference Include="GraphQL" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
diff --git a/src/Harness/Harness.csproj b/src/Harness/Harness.csproj
index 0a75502..3ffb5f0 100644
--- a/src/Harness/Harness.csproj
+++ b/src/Harness/Harness.csproj
@@ -13,9 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="2.0.0-alpha-931" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="3.1.0-alpha0022" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.1.0-alpha0022" />
+    <PackageReference Include="GraphQL" Version="2.0.0" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="3.1.0" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
   </ItemGroup>
 
diff --git a/src/Harness/Startup.cs b/src/Harness/Startup.cs
index 275658e..ae67f05 100644
--- a/src/Harness/Startup.cs
+++ b/src/Harness/Startup.cs
@@ -16,6 +16,7 @@
 using GraphQL.Server.Transports.AspNetCore;
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Validation;
+using GraphQL.Server;
 
 namespace Harness
 {
@@ -56,26 +57,21 @@ type Query {
                 _.AddPolicy("AdminPolicy", p => p.RequireClaim("role", "Admin"));
             });
 
-            services.AddGraphQLHttp();
+            services.AddGraphQL(options =>
+            {
+                options.ExposeExceptions = true;
+            }).AddUserContextBuilder(context => new GraphQLUserContext { User = context.User });
 
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
+            app.UseDeveloperExceptionPage();
 
             var validationRules = app.ApplicationServices.GetServices<IValidationRule>();
 
-            var options = new GraphQLHttpOptions();
-
-            validationRules.Concat(DocumentValidator.CoreRules()).Apply(options.ValidationRules.Add);
-            options.BuildUserContext = httpContext => new GraphQLUserContext { User = httpContext.User };
-
-            app.UseGraphQLHttp<ISchema>(options);
+            app.UseGraphQL<ISchema>("/graphql");
             app.UseGraphiQLServer(new GraphiQLOptions());
 
             app.UseMvc();
diff --git a/tools/tasks/settings.js b/tools/tasks/settings.js
index f0ae627..6463630 100644
--- a/tools/tasks/settings.js
+++ b/tools/tasks/settings.js
@@ -15,7 +15,7 @@ const CI = process.env.CI && process.env.CI.toString().toLowerCase() === 'true';
 
 const artifacts = path.resolve('./artifacts');
 
-const versionSuffix = '-alpha-'
+const versionSuffix = ''
 
 export default {
   appVeyorJobId,