Merge pull request #300 from btecu/updates

Upgrade to AspNetCore/EfCore 2.1 and use `Mvc.Core` instead of `Mvc`

Author: jaredcnance

.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

Directory.Build.props

@@ -4,28 +4,27 @@
     <NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion>
     <NetStandardVersion>netstandard2.0</NetStandardVersion>
 
-    <AspNetCoreVersion>2.0.1</AspNetCoreVersion>
+    <AspNetCoreVersion>2.1.0</AspNetCoreVersion>
 
-    <MicrosoftLoggingVersion>2.0.0</MicrosoftLoggingVersion>
-    <MicrosoftConfigurationVersion>2.0.0</MicrosoftConfigurationVersion>
-    <MicrosoftOptionsVersion>2.0.0</MicrosoftOptionsVersion>
+    <MicrosoftLoggingVersion>2.1.0</MicrosoftLoggingVersion>
+    <MicrosoftConfigurationVersion>2.1.0</MicrosoftConfigurationVersion>
+    <MicrosoftOptionsVersion>2.1.0</MicrosoftOptionsVersion>
 
-    <EFCoreVersion>2.0.1</EFCoreVersion>
-    <EFCoreToolsVersion>2.0.1</EFCoreToolsVersion>
+    <EFCoreVersion>2.1.0</EFCoreVersion>
+    <EFCoreToolsVersion>2.1.0</EFCoreToolsVersion>
 
-    <NpgsqlVersion>3.2.6</NpgsqlVersion>
-    <NpgsqlPostgreSQLVersion>2.0.0</NpgsqlPostgreSQLVersion>
+    <NpgsqlVersion>4.0.0</NpgsqlVersion>
+    <NpgsqlPostgreSQLVersion>2.1.0</NpgsqlPostgreSQLVersion>
 
-    <TuplesVersion>4.4.0</TuplesVersion>
+    <TuplesVersion>4.5.0</TuplesVersion>
   </PropertyGroup>
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <TestSdkVersion>15.3.0-preview-20170427-09</TestSdkVersion>
-    <TestHostVersion>1.1.2</TestHostVersion>
-    <XUnitVersion>2.3.0-beta3-build3705</XUnitVersion>
-    <BogusVersion>15.0.3</BogusVersion>
-    <MoqVersion>4.7.99</MoqVersion>
+    <TestSdkVersion>15.7.2</TestSdkVersion>
+    <XUnitVersion>2.3.1</XUnitVersion>
+    <BogusVersion>22.1.2</BogusVersion>
+    <MoqVersion>4.8.3</MoqVersion>
   </PropertyGroup>
 
 </Project>

benchmarks/Benchmarks.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>Benchmarks</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
     <PackageReference Include="moq" Version="$(MoqVersion)" />
     <PackageReference Include="xunit" Version="$(xUnitVersion)" />
   </ItemGroup>

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,17 +33,12 @@ 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;
         private readonly IJsonApiContext _jsonApiContext;
 
-        protected IActionResult UnprocessableEntity()
-        {
-            return new StatusCodeResult(422);
-        }
-
         protected IActionResult Forbidden()
         {
             return new StatusCodeResult(403);

src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

@@ -25,4 +25,5 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreToolsVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
   </ItemGroup>
+
 </Project>

src/Examples/JsonApiDotNetCoreExample/Migrations/20180327120810_initial.Designer.cs

@@ -1,7 +1,8 @@
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace JsonApiDotNetCoreExample.Migrations
 {

src/Examples/JsonApiDotNetCoreExample/Migrations/20180327120810_initial.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using JsonApiDotNetCoreExample.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
 using System;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace JsonApiDotNetCoreExample.Migrations
 {