Use MvcCore instead of Mvc

Author: btecu

.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

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();

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()

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;

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";

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)" />

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 =>

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()
         {

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;
 

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();