瀏覽代碼

Update to .NET6

Justin 3 年之前
父節點
當前提交
4d64c2a4e1

+ 2 - 2
JsonRpcLite.Kcp/JsonRpcLite.Kcp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>IUS, VINNO</Authors>
     <Company>VINNO Technology (Suzhou) Co.,Ltd.</Company>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonRpcLite" Version="1.0.0" />
+    <PackageReference Include="JsonRpcLite" Version="1.1.0" />
     <PackageReference Include="KcpNet" Version="1.0.0" />
   </ItemGroup>
 

+ 3 - 3
JsonRpcLite.Kestrel/JsonRpcLite.Kestrel.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Company>VINNO Technology (Suzhou) Co.,Ltd.</Company>
     <Authors>IUS, VINNO</Authors>
     <Description>The kestrel engine for JsonRpcLite.</Description>
     <PackageProjectUrl>http://git.ius.plus:88/Project-Wing/JsonRpcLite</PackageProjectUrl>
     <RepositoryUrl>http://git.ius.plus:88/Project-Wing/JsonRpcLite</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonRpcLite" Version="1.0.0" />
+    <PackageReference Include="JsonRpcLite" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />

+ 1 - 1
JsonRpcLite.Kestrel/JsonRpcLite.Kestrel.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>D:\Projects\MyProjects\JsonRpcLite\JsonRpcLite.Kestrel\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>D:\New-Projects\JsonRpcLite\JsonRpcLite.Kestrel\Properties\PublishProfiles\FolderProfile1.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>

+ 1 - 1
TestClient/TestClient.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

+ 25 - 19
TestServer/Program.cs

@@ -6,7 +6,7 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using JsonRpcLite.InProcess;
-using JsonRpcLite.Kcp;
+//using JsonRpcLite.Kcp;
 //using JsonRpcLite.Kestrel;
 using JsonRpcLite.Log;
 using JsonRpcLite.Network;
@@ -37,29 +37,35 @@ namespace TestServer
                 Logger.UseDefaultWriter();
             }
 
-            if (args.Contains("-benchmark"))
+            //if (args.Contains("-benchmark"))
             {
                 var engine = new JsonRpcInProcessEngine();
                 server.UseEngine(engine);
                 client.UseEngine(engine);
+                //server.RegisterService<ITest2>(new InterfaceTest());
+                server.RegisterService(typeof(ITest2), (object)(new InterfaceTest()));
                 server.Start();
-                var statisticsList = new List<int>();
-                for (var i = 0; i < 5; i++)
-                {
-                    statisticsList.Add(Benchmark(client, TestData));
-                    Console.WriteLine();
-                }
-                Console.WriteLine();
-                Console.WriteLine($"Best: {statisticsList.Max()} rpc/sec, \t Average: {(int)statisticsList.Average()} rpc/sec, \t Worst: {statisticsList.Min()} rpc/sec");
+                var proxy = client.CreateProxy<ITest2>();
+
+
+                var result = proxy.AddInt(2, 3);
+                //var statisticsList = new List<int>();
+                //for (var i = 0; i < 5; i++)
+                //{
+                //    statisticsList.Add(Benchmark(client, TestData));
+                //    Console.WriteLine();
+                //}
+                //Console.WriteLine();
+                //Console.WriteLine($"Best: {statisticsList.Max()} rpc/sec, \t Average: {(int)statisticsList.Average()} rpc/sec, \t Worst: {statisticsList.Min()} rpc/sec");
             }
-            else
-            {
+            //else
+            //{
                 IJsonRpcServerEngine serverEngine;
                 //if (args.Contains("-kcp"))
-                {
-                    serverEngine = new JsonRpcKcpServerEngine(IPAddress.Any, 6000);
-                    server.UseEngine(serverEngine);
-                }
+           //     {
+           //         serverEngine = new JsonRpcKcpServerEngine(IPAddress.Any, 6000);
+           //         server.UseEngine(serverEngine);
+           //     }
 
                 //if (args.Contains("-websocket"))
                 //{
@@ -83,9 +89,9 @@ namespace TestServer
                 //    server.UseEngine(serverEngine);
                 //}
 
-                server.Start();
-                Console.WriteLine($"JsonRpc Server Started with engine: {serverEngine.Name}.");
-            }
+             //   server.Start();
+             ///   Console.WriteLine($"JsonRpc Server Started with engine: {serverEngine.Name}.");
+            //}
             Console.ReadLine();
         }
 

+ 2 - 2
TestServer/TestServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\JsonRpcLite.Kcp\JsonRpcLite.Kcp.csproj" />
+    <ProjectReference Include="..\JsonRpcLite\JsonRpcLite.csproj" />
   </ItemGroup>
 
 </Project>