update to net6.0

Author: xuanye

build/version.props

@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<GrpcHttpApiPackageVersion>1.0.0</GrpcHttpApiPackageVersion>		
+		<GrpcHttpApiPackageVersion>1.1.0</GrpcHttpApiPackageVersion>		
 	</PropertyGroup>
 </Project>

sample/Grpc.HttpApi.Sample/Grape.Grpc.HttpApi.Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

src/Grape.Grpc.HttpApi/Grape.Grpc.HttpApi.csproj

@@ -2,7 +2,7 @@
  <Import Project="../../build/version.props" />
  <Import Project="../../build/releasenotes.props" /> 
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+	 <TargetFramework>net6.0</TargetFramework>
 
     <Description>Implement Grpc interface conversion layer HttpApi interface</Description>
     <Copyright>Xuanye @ 2021</Copyright>
@@ -24,14 +24,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.17.3" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.34.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.34.0">
+    <PackageReference Include="Google.Protobuf" Version="3.27.1" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.63.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.64.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.14" />
   </ItemGroup>
   <ItemGroup>
     <Protobuf Include="Protos\**\*.proto" ProtoRoot="Protos" GrpcServices="Both" />

src/Grape.Grpc.HttpApi/Swagger/SwaggerMiddleware.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,7 +15,7 @@ public class SwaggerMiddleware
 
         public SwaggerMiddleware(
             SwaggerOptions options,
-            RequestDelegate next,            
+            RequestDelegate next,
             ILogger<SwaggerMiddleware> logger
             )
         {
@@ -38,17 +37,16 @@ public async Task Invoke(HttpContext httpContext, ISwaggerProvider swaggerProvid
                 var swagger = swaggerProvider.GetSwaggerInfo();
                 await RespondWithSwaggerJson(httpContext.Response, swagger);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 _logger.LogError(ex, ex.Message);
                 RespondWithNotFound(httpContext.Response);
             }
-
         }
 
         private bool RequestingSwaggerDocument(HttpRequest request)
         {
-            if(!string.Equals(request.Method, "get", StringComparison.OrdinalIgnoreCase))
+            if (!string.Equals(request.Method, "get", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
@@ -66,14 +64,9 @@ private async Task RespondWithSwaggerJson(HttpResponse response, SwaggerInfo swa
             response.StatusCode = 200;
             response.ContentType = "application/json;charset=utf-8";
 
-            var settings = new Newtonsoft.Json.JsonSerializerSettings
-            {
-                DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore
-            };
+            var swaggerJson = System.Text.Json.JsonSerializer.Serialize(swagger, new System.Text.Json.JsonSerializerOptions(System.Text.Json.JsonSerializerDefaults.Web));
 
-            var swaggerJson = Newtonsoft.Json.JsonConvert.SerializeObject(swagger, Newtonsoft.Json.Formatting.None, settings);
             await response.WriteAsync(swaggerJson, new UTF8Encoding(false));
         }
     }
-       
-}
+}

tests/Grape.Grpc.HttpApi.UnitTests/Grape.Grpc.HttpApi.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>