Merge pull request #36 from elsupergomez/update-aspnetcore-to-3.0

Update AspNetCore to 3.x

Author: RodrigoPereyraDiaz

appveyor.yml

@@ -1,6 +1,6 @@
-os: Visual Studio 2017
+os: Visual Studio 2019
 
-version: 2.2.0-alpha-{build}
+version: 2.2.1-alpha-{build}
 
 nuget:
   project_feed: true

src/MakingSense.AspNetCore.HypermediaApi/Formatters/HypermediaApiJsonInputFormatter.cs

@@ -6,6 +6,11 @@
 using Microsoft.Extensions.ObjectPool;
 using Newtonsoft.Json;
 
+#if NETCOREAPP3_0 || NETCOREAPP3_1
+using MvcJsonOptions = Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions;
+using JsonInputFormatter = Microsoft.AspNetCore.Mvc.Formatters.NewtonsoftJsonInputFormatter;
+#endif
+
 namespace MakingSense.AspNetCore.HypermediaApi.Formatters
 {
 	// TODO: it is difficult to personalize it. Find an alternative.

src/MakingSense.AspNetCore.HypermediaApi/Formatters/Internal/HypermediaApiMvcOptionsSetup.cs

@@ -7,6 +7,10 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
+#if NETCOREAPP3_0 || NETCOREAPP3_1
+using MvcJsonOptions = Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions;
+#endif
+
 namespace MakingSense.AspNetCore.HypermediaApi.Formatters.Internal
 {
 	public class HypermediaApiMvcOptionsSetup : ConfigureOptions<MvcOptions>
@@ -40,7 +44,17 @@ public static void ConfigureMvc(
 			serializerSettings.DateParseHandling = DateParseHandling.None;
 
 			options.OutputFormatters.Clear();
-			options.OutputFormatters.Add(new JsonOutputFormatter(serializerSettings, charPool));
+
+			var jsonOutputFormatter =
+#if NETCOREAPP3_0 || NETCOREAPP3_1
+				new NewtonsoftJsonOutputFormatter(serializerSettings, charPool, options);
+#elif NETSTANDARD2_0
+				new JsonOutputFormatter(serializerSettings, charPool);
+#else
+#error unknown target framework
+#endif
+
+			options.OutputFormatters.Add(jsonOutputFormatter);
 
 			options.InputFormatters.Clear();
 			var jsonInputLogger = loggerFactory.CreateLogger<HypermediaApiJsonInputFormatter>();

src/MakingSense.AspNetCore.HypermediaApi/MakingSense.AspNetCore.HypermediaApi.csproj

@@ -3,25 +3,41 @@
   <PropertyGroup>
     <Description>MakingSense.AspNetCore.HypermediaApi Class Library</Description>
     <Authors>MakingSense</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+	<TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>MakingSense.AspNetCore.HypermediaApi</AssemblyName>
     <PackageId>MakingSense.AspNetCore.HypermediaApi</PackageId>
     <PackageTags>ASP.NET 5;vnext;Hypermedia;API;REST;ASP.NET Core</PackageTags>
     <PackageProjectUrl>https://github.com/MakingSense/aspnet-hypermedia-api</PackageProjectUrl>
     <PackageLicenseUrl>http://www.gnu.org/licenses/lgpl.html</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/MakingSense/aspnet-hypermedia-api</RepositoryUrl>
-    <VersionPrefix>2.2.0-alpha</VersionPrefix>
+    <VersionPrefix>2.2.1-alpha</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MakingSense.AspNetCore.Abstractions\MakingSense.AspNetCore.Abstractions.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson">
+      <Version>3.1.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson">
+      <Version>3.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="System.Linq" Version="4.3.0" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />