.NET Core 2.2 -> 3.0

Directory.Build.props

@@ -1,24 +1,23 @@
 <Project>
-
   <PropertyGroup>
-    <NetCoreAppVersion>netcoreapp2.2</NetCoreAppVersion>
-    <NetStandardVersion>netstandard2.0</NetStandardVersion>
-    <AspNetCoreVersion>2.2.*</AspNetCoreVersion>
-    <MicrosoftLoggingVersion>2.2.*</MicrosoftLoggingVersion>
-    <MicrosoftConfigurationVersion>2.2.*</MicrosoftConfigurationVersion>
-    <MicrosoftOptionsVersion>2.2.*</MicrosoftOptionsVersion>
-    <EFCoreVersion>2.2.*</EFCoreVersion>
-    <EFCoreToolsVersion>2.2.*</EFCoreToolsVersion>
-    <NpgsqlVersion>4.0.0</NpgsqlVersion>
-    <NpgsqlPostgreSQLVersion>2.1.0</NpgsqlPostgreSQLVersion>
+    <NetCoreAppVersion>netcoreapp3.0</NetCoreAppVersion>
+    <NetStandardVersion>netstandard2.1</NetStandardVersion>
+    <AspNetCoreVersion>3.*</AspNetCoreVersion>
+    <MicrosoftLoggingVersion>3.*</MicrosoftLoggingVersion>
+    <MicrosoftConfigurationVersion>3.*</MicrosoftConfigurationVersion>
+    <MicrosoftOptionsVersion>3.*</MicrosoftOptionsVersion>
+    <EFCoreVersion>3.*</EFCoreVersion>
+    <EFCoreToolsVersion>3.*</EFCoreToolsVersion>
+    <NpgsqlVersion>4.1.1</NpgsqlVersion>
+    <NpgsqlPostgreSQLVersion>3.0.1</NpgsqlPostgreSQLVersion>
     <TuplesVersion>4.5.0</TuplesVersion>
   </PropertyGroup>
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <TestSdkVersion>15.7.2</TestSdkVersion>
-    <XUnitVersion>2.3.1</XUnitVersion>
-    <BogusVersion>22.1.2</BogusVersion>
-    <MoqVersion>4.8.3</MoqVersion>
+    <TestSdkVersion>16.3.0</TestSdkVersion>
+    <XUnitVersion>2.4.1</XUnitVersion>
+    <BogusVersion>28.4.1</BogusVersion>
+    <MoqVersion>4.13.1</MoqVersion>
   </PropertyGroup>
 </Project>

JsonApiDotnetCore.sln

@@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore", "src\Js
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted", "src\Examples\GettingStarted\GettingStarted.csproj", "{067FFD7A-C66B-473D-8471-37F5C95DF61C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "test\IntegrationTests\IntegrationTests.csproj", "{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -158,6 +160,18 @@ Global
 		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.Build.0 = Release|Any CPU
 		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.ActiveCfg = Release|Any CPU
 		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.Build.0 = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x64.Build.0 = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -173,6 +187,7 @@ Global
 		{789085E1-048F-4996-B600-791B9CA3A663} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
 		{8BCFF95F-4850-427C-AEDB-B5B4F62B2C7B} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
 		{21D27239-138D-4604-8E49-DCBE41BCE4C8} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
+		{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A2421882-8F0A-4905-928F-B550B192F9A4}

README.md

@@ -53,10 +53,12 @@ public class Article : Identifiable
 ```csharp
 public class ArticlesController : JsonApiController<Article>
 {
-    public ArticlesController(
-        IJsonApiContext jsonApiContext,
-        IResourceService<Article> resourceService) 
-    : base(jsonApiContext, resourceService) { }
+        public ArticlesController(
+            IJsonApiOptions jsonApiOptions,
+            IResourceService<Article> resourceService,
+            ILoggerFactory loggerFactory) 
+            : base(jsonApiOptions, resourceService, loggerFactory)
+        { }
 }
 ```
 
@@ -79,19 +81,18 @@ public class Startup
 
 ### Development
 
-Restore all nuget packages with:
+Restore all NuGet packages with:
 
 ```bash
 dotnet restore
 ```
 
 #### Testing
 
-Running tests locally requires access to a postgresql database.  
-If you have docker installed, this can be propped up via: 
+Running tests locally requires access to a PostgreSQL database.  If you have docker installed, this can be propped up via: 
 
 ```bash
-docker run --rm --name jsonapi-dotnet-core-testing  -e POSTGRES_DB=JsonApiDotNetCoreExample -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432   postgres
+docker run --rm --name jsonapi-dotnet-core-testing  -e POSTGRES_DB=JsonApiDotNetCoreExample -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres
 ```
 
 And then to run the tests:
@@ -107,3 +108,15 @@ Sometimes the compiled files can be dirty / corrupt from other branches / failed
 ```bash
 dotnet clean
 ```
+
+
+## Compatibility
+
+A lot of changes were introduced in v4.0.0, the following chart should help you with compatibility issues between .NET Core versions
+
+| .NET Core Version | JADNC Version |
+| ----------------- | ------------- |
+| 2.0 - 2.2         | v3.*          |
+| 3.*               | v4.*          |
+
+

src/Examples/GettingStarted/GettingStarted.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
   </ItemGroup>

src/Examples/GettingStarted/Startup.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Extensions;
@@ -21,11 +20,9 @@ public void ConfigureServices(IServiceCollection services)
                 discover => discover.AddCurrentAssembly(), mvcBuilder: mvcBuilder);
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDbContext context)
+        public void Configure(IApplicationBuilder app, SampleDbContext context)
         {
             context.Database.EnsureDeleted(); // indicies need to be reset
-            context.Database.EnsureCreated();
-
             app.UseJsonApi();
         }
     }

src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs

@@ -1,6 +1,5 @@
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.EntityFrameworkCore;
-using JsonApiDotNetCoreExample.Models.Entities;
 
 namespace JsonApiDotNetCoreExample.Data
 {
@@ -25,19 +24,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .WithMany(p => p.TodoItems)
                 .HasForeignKey(t => t.OwnerId);
 
-            modelBuilder.Entity<CourseStudentEntity>()
-                .HasKey(r => new { r.CourseId, r.StudentId });
-
-            modelBuilder.Entity<CourseStudentEntity>()
-                .HasOne(r => r.Course)
-                .WithMany(c => c.Students)
-                .HasForeignKey(r => r.CourseId);
-
-            modelBuilder.Entity<CourseStudentEntity>()
-                .HasOne(r => r.Student)
-                .WithMany(s => s.Courses)
-                .HasForeignKey(r => r.StudentId);
-
             modelBuilder.Entity<ArticleTag>()
                 .HasKey(bc => new { bc.ArticleId, bc.TagId });
 
@@ -84,10 +70,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         public DbSet<Author> Authors { get; set; }
         public DbSet<NonJsonApiResource> NonJsonApiResources { get; set; }
         public DbSet<User> Users { get; set; }
-        public DbSet<CourseEntity> Courses { get; set; }
-        public DbSet<DepartmentEntity> Departments { get; set; }
-        public DbSet<CourseStudentEntity> Registrations { get; set; }
-        public DbSet<StudentEntity> Students { get; set; }
         public DbSet<PersonRole> PersonRoles { get; set; }
         public DbSet<ArticleTag> ArticleTags { get; set; }
         public DbSet<IdentifiableArticleTag> IdentifiableArticleTags { get; set; }

src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" />
@@ -29,4 +28,7 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Startups\" />
+  </ItemGroup>
 </Project>