From f8feefef0319d53c40f362fde0e1c544b28f6d4d Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Tue, 24 Mar 2020 16:52:32 +0100
Subject: [PATCH 1/4] Updated to .NET Core 3.1 and removed redundant package
 references

---
 Directory.Build.props                         | 17 +++-------
 benchmarks/Benchmarks.csproj                  |  5 +--
 .../GettingStarted/GettingStarted.csproj      |  8 +----
 .../JsonApiDotNetCoreExample.csproj           | 23 +-------------
 .../NoEntityFrameworkExample.csproj           |  9 +++---
 .../ReportsExample/ReportsExample.csproj      | 12 ++-----
 .../JsonApiDotNetCore.csproj                  | 20 +++++-------
 test/DiscoveryTests/DiscoveryTests.csproj     |  9 ++----
 test/IntegrationTests/IntegrationTests.csproj | 22 ++++---------
 .../AuthorizedTodoItemsRepository.cs          | 31 -------------------
 .../JsonApiDotNetCoreExampleTests.csproj      | 26 +++-------------
 .../NoEntityFrameworkTests.csproj             | 20 +++++-------
 test/UnitTests/UnitTests.csproj               | 24 +++++---------
 13 files changed, 52 insertions(+), 174 deletions(-)
 delete mode 100644 test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 7160a70dc2..d55c6ddae7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,16 +1,10 @@
 <Project>
   <PropertyGroup>
-    <NetCoreAppVersion>netcoreapp3.0</NetCoreAppVersion>
+    <NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
     <NetStandardVersion>netstandard2.1</NetStandardVersion>
-    <AspNetCoreVersion>3.0</AspNetCoreVersion>
-    <MicrosoftLoggingVersion>3.0.*</MicrosoftLoggingVersion>
-    <MicrosoftConfigurationVersion>3.0.*</MicrosoftConfigurationVersion>
-    <MicrosoftOptionsVersion>3.0.*</MicrosoftOptionsVersion>
-    <EFCoreVersion>3.0.*</EFCoreVersion>
-    <EFCoreToolsVersion>3.0.*</EFCoreToolsVersion>
-    <NpgsqlVersion>4.1.1</NpgsqlVersion>
-    <NpgsqlPostgreSQLVersion>3.0.1</NpgsqlPostgreSQLVersion>
-    <TuplesVersion>4.5.0</TuplesVersion>
+    <AspNetCoreVersion>3.1.*</AspNetCoreVersion>
+    <EFCoreVersion>3.1.*</EFCoreVersion>
+    <NpgsqlPostgreSQLVersion>3.1.*</NpgsqlPostgreSQLVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -20,9 +14,8 @@
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <TestSdkVersion>16.3.0</TestSdkVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
-    <BogusVersion>28.4.1</BogusVersion>
+    <BogusVersion>29.0.1</BogusVersion>
     <MoqVersion>4.13.1</MoqVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks.csproj
index 02bfbf378d..f57e4c7d95 100644
--- a/benchmarks/Benchmarks.csproj
+++ b/benchmarks/Benchmarks.csproj
@@ -3,12 +3,13 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
     <PackageReference Include="moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit" Version="$(xUnitVersion)" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="../src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/GettingStarted/GettingStarted.csproj b/src/Examples/GettingStarted/GettingStarted.csproj
index 048de21397..b28d7a0c5a 100644
--- a/src/Examples/GettingStarted/GettingStarted.csproj
+++ b/src/Examples/GettingStarted/GettingStarted.csproj
@@ -4,16 +4,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="wwwroot\" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
index d67f773ea7..e1b25693a5 100644
--- a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
+++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -1,34 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>JsonApiDotNetCoreExample</PackageId>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftConfigurationVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftConfigurationVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftConfigurationVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftLoggingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftOptionsVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EFCoreToolsVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreToolsVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Startups\" />
-  </ItemGroup>
 </Project>
diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
index b387f93746..0bf022bbdd 100644
--- a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
+++ b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
+
   <ItemGroup>
-    <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
+    <PackageReference Include="Dapper" Version="2.0.30" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
-    <PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
-    <PackageReference Include="Dapper" Version="1.50.5" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj
index ee832bdf7a..0bf022bbdd 100644
--- a/src/Examples/ReportsExample/ReportsExample.csproj
+++ b/src/Examples/ReportsExample/ReportsExample.csproj
@@ -1,22 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
+    <PackageReference Include="Dapper" Version="2.0.30" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
-    <PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
-    <PackageReference Include="Dapper" Version="1.50.5" />
   </ItemGroup>
-
 </Project>
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
index 3faf239f51..cc5dbc5887 100644
--- a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
+++ b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <VersionPrefix>4.0.0</VersionPrefix>
-    <TargetFrameworks>$(NetCoreAppVersion)</TargetFrameworks>
-    <AssemblyName>JsonApiDotNetCore</AssemblyName>
-    <PackageId>JsonApiDotNetCore</PackageId>
-    <LangVersion>8.0</LangVersion>
+    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -22,12 +19,14 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Ben.Demystifier" Version="0.1.1" />
-    <PackageReference Include="Humanizer" Version="2.4.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Ben.Demystifier" Version="0.1.6" />
+    <PackageReference Include="Humanizer" Version="2.7.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.ValueTuple" Version="$(TuplesVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <!-- 
@@ -42,7 +41,4 @@
   <ItemGroup Condition="'$(GenerateDocumentation)' == 'true'">
     <PackageReference Include="docfx.console" Version="2.33.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Graph\ResourceNameFormatters\" />
-  </ItemGroup>
 </Project>
diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj
index 1be010a233..57c14b39d4 100644
--- a/test/DiscoveryTests/DiscoveryTests.csproj
+++ b/test/DiscoveryTests/DiscoveryTests.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../src/Examples/GettingStarted/GettingStarted.csproj" />
+    <ProjectReference Include="..\..\src\Examples\GettingStarted\GettingStarted.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/IntegrationTests/IntegrationTests.csproj b/test/IntegrationTests/IntegrationTests.csproj
index ef508b1d82..3f68195ab0 100644
--- a/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/IntegrationTests/IntegrationTests.csproj
@@ -1,27 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-
-    <RootNamespace>JADNC.IntegrationTests</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="moq" Version="$(MoqVersion)" />
-    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="coverlet.collector" Version="1.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
     <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs b/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs
deleted file mode 100644
index 4ce5da35d8..0000000000
--- a/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Linq;
-using JsonApiDotNetCore.Data;
-using JsonApiDotNetCore.Services;
-using JsonApiDotNetCoreExample.Models;
-using JsonApiDotNetCoreExampleTests.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreExampleTests.Repositories
-{
-    public class AuthorizedTodoItemsRepository : DefaultEntityRepository<TodoItem>
-    {
-        private readonly ILogger _logger;
-        private readonly IAuthorizationService _authService;
-
-        public AuthorizedTodoItemsRepository(
-            ILoggerFactory loggerFactory,
-            IJsonApiContext jsonApiContext,
-            IDbContextResolver contextResolver,
-            IAuthorizationService authService)
-        : base(loggerFactory, jsonApiContext, contextResolver)
-        {
-            _logger = loggerFactory.CreateLogger<AuthorizedTodoItemsRepository>();
-            _authService = authService;
-        }
-
-        public override IQueryable<TodoItem> Get()
-        {
-            return base.Get().Where(todoItem => todoItem.OwnerId == _authService.CurrentUserId);
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj b/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
index 919ccc48ac..df2f7f25b6 100644
--- a/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
+++ b/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,30 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
-    <ProjectReference Include="../UnitTests/UnitTests.csproj" />
+    <ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
+    <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
-    <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Helpers\Repositories\" />
-    <Folder Include="Helpers\Models\" />
-    <Folder Include="Helpers\Startups\" />
-    <Folder Include="Factories\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Helpers\Repositories\AuthorizedTodoItemsRepository.cs" />
-    <Compile Remove="Helpers\Services\IAuthorizationService.cs" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
index 5b652cb098..d98c5144eb 100644
--- a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
+++ b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
@@ -1,29 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <AssemblyName>NoEntityFrameworkTests</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>NoEntityFrameworkTests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+
   <ItemGroup>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="../../src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj" />
+    <ProjectReference Include="..\..\src\Examples\NoEntityFrameworkExample\NoEntityFrameworkExample.csproj" />
     <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
-    <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
-
 </Project>
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
index f3bd3ca0c0..72a6cd98c4 100644
--- a/test/UnitTests/UnitTests.csproj
+++ b/test/UnitTests/UnitTests.csproj
@@ -1,32 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
+
   <ItemGroup>
-    <ProjectReference Include="../../src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
-    <ProjectReference Include="../../src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
   </ItemGroup>
+
   <ItemGroup>
+    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Bogus" Version="22.1.2" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <None Update="xunit.runner.json"> 
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Repositories\" />
-    <Folder Include="Serialization\Common\" />
-    <Folder Include="Serialization\Client\" />
-    <Folder Include="Serialization\Server\" />
-    <Folder Include="QueryParameters\" />
-  </ItemGroup>
 </Project>

From 5dc4411af67270387bb32aab6718b51b192296be Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Tue, 24 Mar 2020 17:18:52 +0100
Subject: [PATCH 2/4] Updated cibuild config for netcore31

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 935756deab..7a63b8bf55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
 before_script:
   - psql -c 'create database JsonApiDotNetCoreExample;' -U postgres
 mono: none
-dotnet: 3.0.100 # https://www.microsoft.com/net/download/linux
+dotnet: 3.1.2
 branches:
   only:
     - master

From 3b9c887f5be7800a361235a4a70bbe6f3254fb74 Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Tue, 24 Mar 2020 17:20:41 +0100
Subject: [PATCH 3/4] docs

---
 wiki/v4/decoupling-architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki/v4/decoupling-architecture.md b/wiki/v4/decoupling-architecture.md
index 8091fc8723..ef732d2308 100644
--- a/wiki/v4/decoupling-architecture.md
+++ b/wiki/v4/decoupling-architecture.md
@@ -1,6 +1,6 @@
 # V4 Architecture overview
 
-We upgraded to .NET Core 3.0. Furthermore, for V4 we have some explaining to do, namely the most notable changes:
+We upgraded to .NET Core 3.1. Furthermore, for V4 we have some explaining to do, namely the most notable changes:
 
 - [Serialization](./content/serialization.md)
 - [Query Parameter Services](./content/query-parameter-services.md)

From b7ae1b338435384ee35b052dadedcd1f60bf452f Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Tue, 24 Mar 2020 17:25:44 +0100
Subject: [PATCH 4/4] Guessing some more...

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7a63b8bf55..0d4f12b270 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
 before_script:
   - psql -c 'create database JsonApiDotNetCoreExample;' -U postgres
 mono: none
-dotnet: 3.1.2
+dotnet: 3.1
 branches:
   only:
     - master