Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to version 6.0 and net60 #161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to version 6.0 and net60 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebApi.Hal.Build/WebApi.Hal.Commons.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
</PropertyGroup>
<PropertyGroup>
<Major>3</Major>
<Major>6</Major>
<Minor>0</Minor>
<Revision>0</Revision>

Expand Down
14 changes: 7 additions & 7 deletions WebApi.Hal.Tests/WebApi.Hal.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<Import Project=".\..\WebApi.Hal.Build\WebApi.Hal.Commons.props" />

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net60</TargetFramework>
<Version>3.0.0-pre-1</Version>
<Authors>Jake Ginnivan, DotNetMedia Organizaion</Authors>
<Copyright>Copyright © Jake Ginnvan 2017</Copyright>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Assent" Version="1.6.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Assent" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
3 changes: 1 addition & 2 deletions WebApi.Hal.Web/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions WebApi.Hal.Web/WebApi.Hal.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project=".\..\WebApi.Hal.Build\WebApi.Hal.Commons.props" />

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net60</TargetFramework>
<AssemblyName>WebApi.Hal.Web</AssemblyName>
</PropertyGroup>

Expand All @@ -12,10 +12,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.9" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.10" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions WebApi.Hal/JsonHalMediaTypeOutputFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public JsonHalMediaTypeOutputFormatter(
ArrayPool<char> charPool,
MvcOptions mvcOptions,
IHypermediaResolver hypermediaResolver) :
base(serializerSettings, charPool, mvcOptions)
base(serializerSettings, charPool, mvcOptions, null)
{
if (hypermediaResolver == null)
{
Expand All @@ -38,7 +38,7 @@ public JsonHalMediaTypeOutputFormatter(
JsonSerializerSettings serializerSettings,
ArrayPool<char> charPool,
MvcOptions mvcOptions) :
base(serializerSettings, charPool, mvcOptions)
base(serializerSettings, charPool, mvcOptions, null)
{
_resourceConverter = new ResourceConverter(SerializerSettings);
Initialize();
Expand Down
14 changes: 6 additions & 8 deletions WebApi.Hal/WebApi.Hal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
<Import Project=".\..\WebApi.Hal.Build\WebApi.Hal.Commons.props" />

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<Version>4.0.1</Version>
<PackageVersion>4.0.1</PackageVersion>
<TargetFrameworks>net60</TargetFrameworks>
<Version>6.0.0</Version>
<PackageVersion>6.0.0-prerelease</PackageVersion>
<Copyright>Copyright © Jake Ginnivan 2020</Copyright>
<Description>Adds support for the Hal Media Type (and Hypermedia) to Asp.net</Description>
<ProjectUrl>https://github.com/JakeGinnivan/WebApi.Hal</ProjectUrl>
<IsPackable>true</IsPackable>
<PackageReleaseNotes>
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
Expand All @@ -32,12 +33,9 @@


<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.2" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="Tavis.UriTemplates" Version="1.1.1" />
</ItemGroup>
Expand Down