Use MvcCore instead of Mvc

btecu · btecu · commit 443e0392e4e9 · 2018-06-11T23:35:28.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: csharp
 dist: trusty
 sudo: required
-services: 
+services:
  - postgresql
 before_script:
   - psql -c 'create database JsonApiDotNetCoreExample;' -U postgres
 mono: none
-dotnet: 2.1.105 # https://www.microsoft.com/net/download/linux
+dotnet: 2.1.300 # https://www.microsoft.com/net/download/linux
 branches:
   only:
     - master
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/Restricted/ReadOnlyController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/Restricted/ReadOnlyController.cs
@@ -5,7 +5,7 @@ namespace JsonApiDotNetCoreExample.Controllers.Restricted
 {
     [Route("[controller]")]
     [HttpReadOnly]
-    public class ReadOnlyController : Controller
+    public class ReadOnlyController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get() => Ok();
@@ -22,7 +22,7 @@ public class ReadOnlyController : Controller
 
     [Route("[controller]")]
     [NoHttpPost]
-    public class NoHttpPostController : Controller
+    public class NoHttpPostController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get() => Ok();
@@ -39,7 +39,7 @@ public class NoHttpPostController : Controller
 
     [Route("[controller]")]
     [NoHttpPatch]
-    public class NoHttpPatchController : Controller
+    public class NoHttpPatchController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get() => Ok();
@@ -56,7 +56,7 @@ public class NoHttpPatchController : Controller
 
     [Route("[controller]")]
     [NoHttpDelete]
-    public class NoHttpDeleteController : Controller
+    public class NoHttpDeleteController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get() => Ok();
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TestValuesController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TestValuesController.cs
@@ -3,7 +3,7 @@
 namespace JsonApiDotNetCoreExample.Controllers
 {
     [Route("[controller]")]
-    public class TestValuesController : Controller
+    public class TestValuesController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get()
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs
@@ -33,7 +33,7 @@ public CustomJsonApiController(
     }
 
     public class CustomJsonApiController<T, TId>
-    : Controller where T : class, IIdentifiable<TId>
+    : ControllerBase where T : class, IIdentifiable<TId>
     {
         private readonly ILogger _logger;
         private readonly IResourceService<T, TId> _resourceService;
diff --git a/src/Examples/NoEntityFrameworkExample/Startup.cs b/src/Examples/NoEntityFrameworkExample/Startup.cs
@@ -1,4 +1,4 @@
-﻿using JsonApiDotNetCore.Extensions;
+using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
@@ -31,7 +31,7 @@ public Startup(IHostingEnvironment env)
         public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
-            var mvcBuilder = services.AddMvc();
+            var mvcBuilder = services.AddMvcCore();
 
             services.AddJsonApi(options => {
                 options.Namespace = "api/v1";
diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
     <PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
diff --git a/src/Examples/ReportsExample/Startup.cs b/src/Examples/ReportsExample/Startup.cs
@@ -25,7 +25,7 @@ public Startup(IHostingEnvironment env)
 
         public virtual void ConfigureServices(IServiceCollection services)
         {
-            var mvcBuilder = services.AddMvc();
+            var mvcBuilder = services.AddMvcCore();
             services.AddJsonApi(opt =>
             {
                 opt.BuildContextGraph(builder =>
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiControllerMixin.cs b/src/JsonApiDotNetCore/Controllers/JsonApiControllerMixin.cs
@@ -5,7 +5,7 @@
 
 namespace JsonApiDotNetCore.Controllers
 {
-    public abstract class JsonApiControllerMixin : Controller
+    public abstract class JsonApiControllerMixin : ControllerBase
     {
         protected IActionResult UnprocessableEntity()
         {
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
@@ -8,7 +8,7 @@ namespace JsonApiDotNetCore.Controllers
     /// <summary>
     /// A controller to be used for bulk operations as defined in the json:api 1.1 specification
     /// </summary>
-    public class JsonApiOperationsController : Controller
+    public class JsonApiOperationsController : ControllerBase
     {
         private readonly IOperationsProcessor _operationsProcessor;
 
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -23,20 +23,20 @@ public static class IServiceCollectionExtensions
         public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services)
             where TContext : DbContext
         {
-            var mvcBuilder = services.AddMvc();
-            return AddJsonApi<TContext>(services, (opt) => { }, mvcBuilder);
+            var mvcBuilder = services.AddMvcCore();
+            return AddJsonApi<TContext>(services, opt => { }, mvcBuilder);
         }
 
         public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services, Action<JsonApiOptions> options)
             where TContext : DbContext
         {
-            var mvcBuilder = services.AddMvc();
+            var mvcBuilder = services.AddMvcCore();
             return AddJsonApi<TContext>(services, options, mvcBuilder);
         }
 
         public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services,
            Action<JsonApiOptions> options,
-           IMvcBuilder mvcBuilder) where TContext : DbContext
+           IMvcCoreBuilder mvcBuilder) where TContext : DbContext
         {
             var config = new JsonApiOptions();
 
@@ -57,7 +57,7 @@ public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection se
 
         public static IServiceCollection AddJsonApi(this IServiceCollection services,
             Action<JsonApiOptions> options,
-            IMvcBuilder mvcBuilder)
+            IMvcCoreBuilder mvcBuilder)
         {
             var config = new JsonApiOptions();
 
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -19,11 +19,12 @@
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
     <PackageReference Include="System.Memory" Version="4.5.0-preview2-26406-04" />
     <PackageReference Include="System.ValueTuple" Version="$(TuplesVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <!-- 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace JsonApiDotNetCoreExample.Controllers`
`4`	`4`	`{`
`5`	`5`	`[Route("[controller]")]`
`6`		`- public class TestValuesController : Controller`
	`6`	`+ public class TestValuesController : ControllerBase`
`7`	`7`	`{`
`8`	`8`	`[HttpGet]`
`9`	`9`	`public IActionResult Get()`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public CustomJsonApiController(`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public class CustomJsonApiController<T, TId>`
`36`		`- : Controller where T : class, IIdentifiable<TId>`
	`36`	`+ : ControllerBase where T : class, IIdentifiable<TId>`
`37`	`37`	`{`
`38`	`38`	`private readonly ILogger _logger;`
`39`	`39`	`private readonly IResourceService<T, TId> _resourceService;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Startup(IHostingEnvironment env)`
`25`	`25`
`26`	`26`	`public virtual void ConfigureServices(IServiceCollection services)`
`27`	`27`	`{`
`28`		`- var mvcBuilder = services.AddMvc();`
	`28`	`+ var mvcBuilder = services.AddMvcCore();`
`29`	`29`	`services.AddJsonApi(opt =>`
`30`	`30`	`{`
`31`	`31`	`opt.BuildContextGraph(builder =>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace JsonApiDotNetCore.Controllers`
`7`	`7`	`{`
`8`		`- public abstract class JsonApiControllerMixin : Controller`
	`8`	`+ public abstract class JsonApiControllerMixin : ControllerBase`
`9`	`9`	`{`
`10`	`10`	`protected IActionResult UnprocessableEntity()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace JsonApiDotNetCore.Controllers`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// A controller to be used for bulk operations as defined in the json:api 1.1 specification`
`10`	`10`	`/// </summary>`
`11`		`- public class JsonApiOperationsController : Controller`
	`11`	`+ public class JsonApiOperationsController : ControllerBase`
`12`	`12`	`{`
`13`	`13`	`private readonly IOperationsProcessor _operationsProcessor;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,20 @@ public static class IServiceCollectionExtensions`
`23`	`23`	`public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services)`
`24`	`24`	`where TContext : DbContext`
`25`	`25`	`{`
`26`		`- var mvcBuilder = services.AddMvc();`
`27`		`- return AddJsonApi<TContext>(services, (opt) => { }, mvcBuilder);`
	`26`	`+ var mvcBuilder = services.AddMvcCore();`
	`27`	`+ return AddJsonApi<TContext>(services, opt => { }, mvcBuilder);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services, Action<JsonApiOptions> options)`
`31`	`31`	`where TContext : DbContext`
`32`	`32`	`{`
`33`		`- var mvcBuilder = services.AddMvc();`
	`33`	`+ var mvcBuilder = services.AddMvcCore();`
`34`	`34`	`return AddJsonApi<TContext>(services, options, mvcBuilder);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services,`
`38`	`38`	`Action<JsonApiOptions> options,`
`39`		`- IMvcBuilder mvcBuilder) where TContext : DbContext`
	`39`	`+ IMvcCoreBuilder mvcBuilder) where TContext : DbContext`
`40`	`40`	`{`
`41`	`41`	`var config = new JsonApiOptions();`
`42`	`42`
`@@ -57,7 +57,7 @@ public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection se`
`57`	`57`
`58`	`58`	`public static IServiceCollection AddJsonApi(this IServiceCollection services,`
`59`	`59`	`Action<JsonApiOptions> options,`
`60`		`- IMvcBuilder mvcBuilder)`
	`60`	`+ IMvcCoreBuilder mvcBuilder)`
`61`	`61`	`{`
`62`	`62`	`var config = new JsonApiOptions();`
`63`	`63`