Upgrade .net 6.0 and support swagger 5.0

fanliang11 · Feb 5, 2022 · 3037b35 · 3037b35
1 parent 5ac4bac
commit 3037b35
Show file tree

Hide file tree

Showing 114 changed files with 6,423 additions and 84 deletions.
diff --git a/src/DotNetty.Codecs/DotNetty.Codecs.DNS/DotNetty.Codecs.DNS.csproj b/src/DotNetty.Codecs/DotNetty.Codecs.DNS/DotNetty.Codecs.DNS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="NuGet">
-    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
   </PropertyGroup>

diff --git a/src/Surging.ApiGateway/Surging.ApiGateway.csproj b/src/Surging.ApiGateway/Surging.ApiGateway.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 

diff --git a/src/Surging.Apm/Surging.Apm.Skywalking/Surging.Apm.Skywalking.csproj b/src/Surging.Apm/Surging.Apm.Skywalking/Surging.Apm.Skywalking.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Abp/Surging.Core.Abp.csproj b/src/Surging.Core/Surging.Core.Abp/Surging.Core.Abp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj b/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

diff --git a/src/Surging.Core/Surging.Core.AutoMapper/Surging.Core.AutoMapper.csproj b/src/Surging.Core/Surging.Core.AutoMapper/Surging.Core.AutoMapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>通过AutoMapper组件实现Dto对象和实体对象之间的相互转换</Description>
 
   </PropertyGroup>

diff --git a/...m/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs b/...m/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs
@@ -114,6 +114,7 @@ private ServiceEntry Create(MethodInfo method, string serviceName, string routeT
                 RoutePath = serviceDescriptor.RoutePath,
                 Methods=httpMethods,
                 MethodName = method.Name,
+                Parameters = method.GetParameters(),
                 Type = method.DeclaringType,
                 Attributes = attributes,
                 Func = (key, parameters) =>

diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/ServiceEntry.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/ServiceEntry.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Surging.Core.CPlatform.Runtime.Server
@@ -17,6 +18,7 @@ public class ServiceEntry
         public string RoutePath { get; set; }
         public Type Type { get; set; }
         public string MethodName { get; set; }
+        public ParameterInfo[] Parameters { get; set; }
         public List<Attribute> Attributes { get; set; }
         /// <summary>
         /// 服务描述符。

diff --git a/src/Surging.Core/Surging.Core.CPlatform/Surging.Core.CPlatform.csproj b/src/Surging.Core/Surging.Core.CPlatform/Surging.Core.CPlatform.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
      <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
      <PackageId>surging</PackageId>
      <Authors>fanly</Authors>

diff --git a/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj b/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

diff --git a/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj b/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

diff --git a/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj b/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec</Description>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>

diff --git a/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj b/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Configuration.Apollo/Surging.Core.Configuration.Apollo.csproj b/src/Surging.Core/Surging.Core.Configuration.Apollo/Surging.Core.Configuration.Apollo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj b/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Authors>fanly</Authors>
     <Version>1.1.0.0</Version>
     <Product>surging Micro Service Framework</Product>

diff --git a/src/Surging.Core/Surging.Core.DNS/Surging.Core.DNS.csproj b/src/Surging.Core/Surging.Core.DNS/Surging.Core.DNS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs b/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs
@@ -78,7 +78,8 @@ public async Task StartAsync(EndPoint endPoint)
                 bossGroup = new MultithreadEventLoopGroup(1);
                 workerGroup = new MultithreadEventLoopGroup();
                 bootstrap.Channel<TcpServerSocketChannel>();
-            } 
+            }
+            var workerGroup1 = new SingleThreadEventLoop();
             bootstrap
             .Option(ChannelOption.SoBacklog, AppConfig.ServerOptions.SoBacklog)
             .ChildOption(ChannelOption.Allocator, PooledByteBufferAllocator.Default)
@@ -88,8 +89,8 @@ public async Task StartAsync(EndPoint endPoint)
                 var pipeline = channel.Pipeline;
                 pipeline.AddLast(new LengthFieldPrepender(4));
                 pipeline.AddLast(new LengthFieldBasedFrameDecoder(int.MaxValue, 0, 4, 0, 4));
-                pipeline.AddLast(workerGroup, "HandlerAdapter", new TransportMessageChannelHandlerAdapter(_transportMessageDecoder));
-                pipeline.AddLast(workerGroup, "ServerHandler", new ServerHandler(async (contenxt, message) =>
+                pipeline.AddLast(workerGroup1, "HandlerAdapter", new TransportMessageChannelHandlerAdapter(_transportMessageDecoder));
+                pipeline.AddLast(workerGroup1, "ServerHandler", new ServerHandler(async (contenxt, message) =>
                 {
                     var sender = new DotNettyServerMessageSender(_transportMessageEncoder, contenxt);
                     await OnReceived(sender, message);

diff --git a/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj b/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Product>surging Micro Service Framework</Product>
     <Company />

diff --git a/src/Surging.Core/Surging.Core.DotNettyWSServer/Surging.Core.DotNettyWSServer.csproj b/src/Surging.Core/Surging.Core.DotNettyWSServer/Surging.Core.DotNettyWSServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj b/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec</Description>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>

diff --git a/src/Surging.Core/Surging.Core.Grpc/Surging.Core.Grpc.csproj b/src/Surging.Core/Surging.Core.Grpc/Surging.Core.Grpc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Kestrel.Log4net/Surging.Core.Kestrel.Log4net.csproj b/src/Surging.Core/Surging.Core.Kestrel.Log4net/Surging.Core.Kestrel.Log4net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Kestrel.Nlog/Surging.Core.Kestrel.Nlog.csproj b/src/Surging.Core/Surging.Core.Kestrel.Nlog/Surging.Core.Kestrel.Nlog.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/DateTimeConverter.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/DateTimeConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace Surging.Core.KestrelHttpServer.Internal
+{
+    public class DateTimeNullConverter : JsonConverter<DateTime?>
+    {
+        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => string.IsNullOrEmpty(reader.GetString()) ? default(DateTime?) : DateTime.Parse(reader.GetString());
+
+        public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+            => writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm"));
+    }
+
+    public class DateTimeConverter : JsonConverter<DateTime>
+    {
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => DateTime.Parse(reader.GetString());
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+            => writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm"));
+    }
+}
diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs
@@ -93,7 +93,7 @@ public static async Task CopyToAsync(Stream source, Stream destination, long? co
 
                     cancel.ThrowIfCancellationRequested();
 
-                    destination.Write(buffer, 0, read);
+                    await destination.WriteAsync(buffer, 0, read);
                 }
             }
             finally

diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs
@@ -55,7 +55,7 @@ public class KestrelHttpMessageListener : HttpMessageListener, IDisposable
             _moduleProvider = moduleProvider;
             _container = container;
             _serviceRouteProvider = serviceRouteProvider;
-            _diagnosticListener = new DiagnosticListener(DiagnosticListenerExtensions.DiagnosticListenerName);
+            _diagnosticListener = new DiagnosticListener(CPlatform.Diagnostics.DiagnosticListenerExtensions.DiagnosticListenerName);
         }
 
         public async Task StartAsync(IPAddress address,int? port)
@@ -115,7 +115,7 @@ public void ConfigureHost(WebHostBuilderContext context, KestrelServerOptions op
         public void ConfigureServices(IServiceCollection services)
         { 
             var builder = new ContainerBuilder();
-            services.AddMvc();
+            services.AddMvc(option => option.EnableEndpointRouting = false);
             _moduleProvider.ConfigureServices(new ConfigurationContext(services,
                 _moduleProvider.Modules,
                 _moduleProvider.VirtualPaths,

diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj b/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>
@@ -18,27 +18,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Surging.Core.CPlatform\Surging.Core.CPlatform.csproj" />
     <ProjectReference Include="..\Surging.Core.ProxyGenerator\Surging.Core.ProxyGenerator.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.Hosting">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.hosting\2.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.logging.abstractions\2.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj b/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Company></Company>

diff --git a/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj b/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageReleaseNotes>1.multiple register center cluster
 2. fix bug</PackageReleaseNotes>
     <Version>1.1.0.0</Version>

diff --git a/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs b/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs
@@ -18,6 +18,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
+using TaskCompletionSource = DotNetty.Common.Concurrency.TaskCompletionSource;
 
 namespace Surging.Core.Protocol.Http
 {

diff --git a/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj b/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>
     <Description>surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec</Description>

diff --git a/src/Surging.Core/Surging.Core.Protocol.Udp/Surging.Core.Protocol.Udp.csproj b/src/Surging.Core/Surging.Core.Protocol.Udp/Surging.Core.Protocol.Udp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj b/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

diff --git a/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyGenerater.cs b/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyGenerater.cs
@@ -63,7 +63,7 @@ public IEnumerable<Type> GenerateProxys(IEnumerable<Type> interfacTypes, IEnumer
             types = interfacTypes.Except(types);
             foreach (var t in types)
             {
-                assemblys = assemblys.Append(t.Assembly);
+                assemblys = assemblys.Append(t.Assembly).ToArray();
             }
             var trees = interfacTypes.Select(p=>GenerateProxyTree(p,namespaces)).ToList();
             var stream = CompilationUtilitys.CompileClientProxy(trees,