diff --git a/WebApi.Hal.Build/WebApi.Hal.Commons.props b/WebApi.Hal.Build/WebApi.Hal.Commons.props index a3001e3..36e2880 100644 --- a/WebApi.Hal.Build/WebApi.Hal.Commons.props +++ b/WebApi.Hal.Build/WebApi.Hal.Commons.props @@ -20,7 +20,7 @@ $(PackageProjectUrl).git - 3 + 6 0 0 diff --git a/WebApi.Hal.Tests/WebApi.Hal.Tests.csproj b/WebApi.Hal.Tests/WebApi.Hal.Tests.csproj index 9aee5f1..e45911d 100644 --- a/WebApi.Hal.Tests/WebApi.Hal.Tests.csproj +++ b/WebApi.Hal.Tests/WebApi.Hal.Tests.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net60 3.0.0-pre-1 Jake Ginnivan, DotNetMedia Organizaion Copyright © Jake Ginnvan 2017 @@ -11,12 +11,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/WebApi.Hal.Web/Startup.cs b/WebApi.Hal.Web/Startup.cs index 5843990..b47db33 100644 --- a/WebApi.Hal.Web/Startup.cs +++ b/WebApi.Hal.Web/Startup.cs @@ -38,8 +38,7 @@ public void ConfigureServices(IServiceCollection services) options.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore; options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore; }) - .AddApiExplorer() - .SetCompatibilityVersion(CompatibilityVersion.Latest); + .AddApiExplorer(); services.AddControllers(); services.TryAddEnumerable( diff --git a/WebApi.Hal.Web/WebApi.Hal.Web.csproj b/WebApi.Hal.Web/WebApi.Hal.Web.csproj index 6bcb306..e685a10 100644 --- a/WebApi.Hal.Web/WebApi.Hal.Web.csproj +++ b/WebApi.Hal.Web/WebApi.Hal.Web.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net60 WebApi.Hal.Web @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/WebApi.Hal/JsonHalMediaTypeOutputFormatter.cs b/WebApi.Hal/JsonHalMediaTypeOutputFormatter.cs index ee751e3..c1bfaf5 100644 --- a/WebApi.Hal/JsonHalMediaTypeOutputFormatter.cs +++ b/WebApi.Hal/JsonHalMediaTypeOutputFormatter.cs @@ -23,7 +23,7 @@ public JsonHalMediaTypeOutputFormatter( ArrayPool charPool, MvcOptions mvcOptions, IHypermediaResolver hypermediaResolver) : - base(serializerSettings, charPool, mvcOptions) + base(serializerSettings, charPool, mvcOptions, null) { if (hypermediaResolver == null) { @@ -38,7 +38,7 @@ public JsonHalMediaTypeOutputFormatter( JsonSerializerSettings serializerSettings, ArrayPool charPool, MvcOptions mvcOptions) : - base(serializerSettings, charPool, mvcOptions) + base(serializerSettings, charPool, mvcOptions, null) { _resourceConverter = new ResourceConverter(SerializerSettings); Initialize(); diff --git a/WebApi.Hal/WebApi.Hal.csproj b/WebApi.Hal/WebApi.Hal.csproj index 60048e3..6349f1a 100644 --- a/WebApi.Hal/WebApi.Hal.csproj +++ b/WebApi.Hal/WebApi.Hal.csproj @@ -3,14 +3,15 @@ - netcoreapp3.1 - 4.0.1 - 4.0.1 + net60 + 6.0.0 + 6.0.0-prerelease Copyright © Jake Ginnivan 2020 Adds support for the Hal Media Type (and Hypermedia) to Asp.net https://github.com/JakeGinnivan/WebApi.Hal true + 6.0.0 update to support .NET 6.0 4.0.1 ability to mark a link-rel as multi-link to ensure that it always serialzies to an array, even if there's only one link at runtime 4.0.0 update to support .net core 3.1 3.10 updates to support multithreaded usage @@ -32,12 +33,9 @@ - + - - - - +