Skip to content

Commit 3037b35

Browse files
committed
Upgrade .net 6.0 and support swagger 5.0
1 parent 5ac4bac commit 3037b35

File tree

114 files changed

+6423
-84
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+6423
-84
lines changed

src/DotNetty.Codecs/DotNetty.Codecs.DNS/DotNetty.Codecs.DNS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup Label="NuGet">
4-
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
77
</PropertyGroup>

src/Surging.ApiGateway/Surging.ApiGateway.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77

src/Surging.Apm/Surging.Apm.Skywalking/Surging.Apm.Skywalking.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/Surging.Core/Surging.Core.Abp/Surging.Core.Abp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<Version>1.0.0.0</Version>
66
<Authors>fanly</Authors>
77
<Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.AutoMapper/Surging.Core.AutoMapper.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<Description>通过AutoMapper组件实现Dto对象和实体对象之间的相互转换</Description>
66

77
</PropertyGroup>

src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ private ServiceEntry Create(MethodInfo method, string serviceName, string routeT
114114
RoutePath = serviceDescriptor.RoutePath,
115115
Methods=httpMethods,
116116
MethodName = method.Name,
117+
Parameters = method.GetParameters(),
117118
Type = method.DeclaringType,
118119
Attributes = attributes,
119120
Func = (key, parameters) =>

src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/ServiceEntry.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Reflection;
34
using System.Threading.Tasks;
45

56
namespace Surging.Core.CPlatform.Runtime.Server
@@ -17,6 +18,7 @@ public class ServiceEntry
1718
public string RoutePath { get; set; }
1819
public Type Type { get; set; }
1920
public string MethodName { get; set; }
21+
public ParameterInfo[] Parameters { get; set; }
2022
public List<Attribute> Attributes { get; set; }
2123
/// <summary>
2224
/// 服务描述符。

src/Surging.Core/Surging.Core.CPlatform/Surging.Core.CPlatform.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<PackageId>surging</PackageId>
77
<Authors>fanly</Authors>

src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<Version>1.1.0.0</Version>
66
<Authors>fanly</Authors>
77
<Product>surging Micro Service Framework</Product>

0 commit comments

Comments
 (0)