Merge pull request #65 from MakingSense/update-for-dotnet-7

Update support for dotnet 7.0.x

Author: Rodrigo Pereyra Diaz

.github/workflows/dotnet.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

NuGet.Config

@@ -4,7 +4,6 @@
 		<!--To inherit the global NuGet package sources remove the <clear/> line below -->
 		<clear />
 		<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-		<add key="aspnetrelease" value="https://www.myget.org/F/aspnetrelease/api/v3/index.json" />
 		<!--
 				<add key="makingsense-aspnet" value="https://ci.appveyor.com/nuget/makingsense-aspnet" />
 		-->

appveyor.yml

@@ -1,4 +1,4 @@
-os: Visual Studio 2019
+os: Visual Studio 2022
 
 version: 2.2.1-alpha-{build}
 

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

@@ -6,7 +6,7 @@
 using System;
 using System.Buffers;
 
-#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0
+#if NET6_0_OR_GREATER
 using MvcJsonOptions = Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions;
 using JsonInputFormatter = Microsoft.AspNetCore.Mvc.Formatters.NewtonsoftJsonInputFormatter;
 #endif

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

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
-#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0
+#if NET6_0_OR_GREATER
 using MvcJsonOptions = Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions;
 #endif
 
@@ -46,8 +46,8 @@ public static void ConfigureMvc(
 			options.OutputFormatters.Clear();
 
 			var jsonOutputFormatter =
-#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0
-				new NewtonsoftJsonOutputFormatter(serializerSettings, charPool, options);
+#if NET6_0_OR_GREATER
+				new NewtonsoftJsonOutputFormatter(serializerSettings, charPool, options, jsonOptions);
 #elif NETSTANDARD2_0 || NETFRAMEWORK
 				new JsonOutputFormatter(serializerSettings, charPool);
 #else

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>MakingSense.AspNetCore.HypermediaApi Class Library</Description>
     <Authors>MakingSense</Authors>
-	<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp3.0;netstandard2.0;net452</TargetFrameworks>
+	<TargetFrameworks>net7.0;net6.0;netstandard2.0;net452</TargetFrameworks>
     <AssemblyName>MakingSense.AspNetCore.HypermediaApi</AssemblyName>
     <PackageId>MakingSense.AspNetCore.HypermediaApi</PackageId>
     <PackageTags>ASP.NET 5;vnext;Hypermedia;API;REST;ASP.NET Core</PackageTags>
@@ -19,25 +19,17 @@
     <ProjectReference Include="..\MakingSense.AspNetCore.Abstractions\MakingSense.AspNetCore.Abstractions.csproj" />
   </ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson">
-			<Version>5.0.3</Version>
-		</PackageReference>
-	</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson">
-      <Version>3.1.0</Version>
+      <Version>7.0.1</Version>
     </PackageReference>
   </ItemGroup>
 
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson">
-      <Version>3.0.0</Version>
+      <Version>6.0.12</Version>
     </PackageReference>
   </ItemGroup>