lith 4 years ago
parent
commit
e9070ac89e

+ 1 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/StringBuilder_RpcContextData.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Sers.Core.Module.Serialization;
 using Vit.Core.Module.Serialization;
 
 namespace Sers.Core.Module.Rpc.Serialization

+ 1 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/Fast/BytePointor_RpcContextData.cs

@@ -1,5 +1,6 @@
 
 using Newtonsoft.Json.Linq;
+using Sers.Core.Module.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;

+ 1 - 2
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/Text_RpcContextData.cs

@@ -3,8 +3,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Vit.Core.Module.Serialization;
-using Vit.Extensions;
+using Sers.Core.Module.Serialization;
 
 namespace Sers.Core.Module.Rpc.Serialization
 {

+ 3 - 1
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization_Text.Newtonsoft.cs → dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Serialization/Serialization_Text.Newtonsoft.cs

@@ -6,10 +6,12 @@ using System.Text.Json.Serialization;
 
 #region 适配 Newtonsoft
 
-namespace Vit.Core.Module.Serialization
+namespace Sers.Core.Module.Serialization
 {
 
     using Newtonsoft.Json.Linq;
+
+    using Vit.Core.Module.Serialization;
     using Vit.Extensions;
 
 

+ 2 - 1
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization_Text.cs → dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Serialization/Serialization_Text.cs

@@ -3,9 +3,10 @@ using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
+using Vit.Core.Module.Serialization;
 using Vit.Core.Util.ConfigurationManager;
 
-namespace Vit.Core.Module.Serialization
+namespace Sers.Core.Module.Serialization
 {
     /// <summary>
     ///  https://github.com/dotnet/runtime/tree/main/src/libraries/System.Text.Json

+ 8 - 7
dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -4,14 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Version>2.1.1.499</Version>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <Authors>Lith</Authors>
     <PackageProjectUrl>https://github.com/serset/Sers/tree/2.1.1/release</PackageProjectUrl>
     <Description>Send email to serset@yeah.net if you have any questions.</Description>
     <PackageReleaseNotes>Send email to serset@yeah.net if you have any questions.</PackageReleaseNotes>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>bin\Debug\netstandard2.0\Sers.Core.xml</DocumentationFile>
@@ -19,14 +19,15 @@
 
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="5.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-  </ItemGroup>  
- 
-  
+  </ItemGroup>
+
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\Vit\Vit.Core\Vit.Core\Vit.Core.csproj" />
     <ProjectReference Include="..\..\Sers.Hardware\Sers.Hardware\Sers.Hardware.csproj" />
-  </ItemGroup> 
- 
+  </ItemGroup>
+
 
 </Project>

+ 3 - 2
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Program.cs → dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Module.Serialization.Qps/Program.cs

@@ -2,6 +2,7 @@
 using Sers.Core.Module.Rpc;
 using Sers.Core.Module.Rpc.Serialization;
 using Sers.Core.Module.Rpc.Serialization.Fast;
+using Sers.Core.Module.Serialization;
 using Statistics;
 using System;
 using System.Collections.Generic;
@@ -142,7 +143,7 @@ namespace App
             {
                 
  
-                var Instance = Vit.Core.Module.Serialization.Serialization_Text.Instance;
+                var Instance =  Serialization_Text.Instance;
 
                 byte[] bytes;
                 JObject jo;
@@ -213,7 +214,7 @@ namespace App
                 //vr 1线程 17-19万
                 // 4线程 87万(cpu 52%)
                 // 8线程 103万(cpu 95%)
-                var Instance = Vit.Core.Module.Serialization.Serialization_Text.Instance;
+                var Instance = Serialization_Text.Instance;
 
 
                 //vr 1线程 58万

+ 0 - 0
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Properties/PublishProfiles/FolderProfile.pubxml → dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Module.Serialization.Qps/Properties/PublishProfiles/FolderProfile.pubxml


+ 3 - 1
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Vit.Core.Module.Serialization.Qps.csproj → dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Module.Serialization.Qps/Sers.Core.Module.Serialization.Qps.csproj

@@ -6,8 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Sers\Sers.Core\Sers.Core.Temp\Sers.Core.Temp.csproj" />
+    <ProjectReference Include="..\..\Sers.Core.Temp\Sers.Core.Temp.csproj" />
   </ItemGroup>
+
+ 
  
 
  

+ 7 - 0
dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Module.Serialization.Qps/StartConsole.bat

@@ -0,0 +1,7 @@
+
+ 
+dotnet Sers.Core.Module.Serialization.Qps.dll
+pause
+
+
+ 

+ 0 - 0
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Statistics/StatisticsQpsAsync.cs → dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Module.Serialization.Qps/Statistics/StatisticsQpsAsync.cs


+ 1 - 11
dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Util.Consumer.Test/Sers.Core.Util.Consumer.Test.csproj

@@ -5,11 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Test\WorkerPoolTest.cs" />
-  </ItemGroup>
- 
-
   <ItemGroup>
     <Content Include="StartConsole.bat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -25,13 +20,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Sers.Core.Temp\Sers.Core.Temp.csproj" />
     <ProjectReference Include="..\..\Sers.Core\Sers.Core.csproj" />
-  </ItemGroup>
+  </ItemGroup> 
  
-
-  <ItemGroup>
-    <Folder Include="Test\" />
-  </ItemGroup>
-
  
 
 </Project>

+ 0 - 7
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/StartConsole.bat

@@ -1,7 +0,0 @@
-
- 
-dotnet Vit.Core.Module.Serialization.Qps.dll
-pause
-
-
- 

+ 5 - 6
dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Lith</Authors>
     <PackageProjectUrl>https://github.com/serset/Sers/tree/2.1.1/release</PackageProjectUrl>
-    <Description>.net core common tool. log to txt,serialize(Newtonsoft.Json/System.Text.Json),ConfigurationManager,DynamicMethodExecutor,Guid,Reflection,Shell etc.</Description>
+    <Description>.net core common tool. log to txt,Serialize(Newtonsoft.Json),ConfigurationManager,DynamicMethodExecutor,Guid,Reflection,Shell etc.</Description>
     <PackageReleaseNotes>Send email to serset@yeah.net if you have any questions.</PackageReleaseNotes>
   </PropertyGroup>
 
@@ -17,13 +17,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>bin\Debug\netstandard2.0\Vit.Core.xml</DocumentationFile>
   </PropertyGroup>
- 
 
-  <ItemGroup>    
+
+  <ItemGroup>    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Buffers" Version="4.5.1" /> 
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" /> 
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
   </ItemGroup>
 
 </Project>

+ 11 - 11
dotnet/Sers.sln

@@ -171,10 +171,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmServer", "Library\Sers\Se
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Module.LocalApi.Qps", "Library\Sers\Sers.Core\Test\Sers.Core.Module.LocalApi.Qps\Sers.Core.Module.LocalApi.Qps.csproj", "{A2E07766-8290-446D-AD4E-D8277687D4C0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Core.Module.Serialization.Qps", "Library\Vit\Vit.Core\Test\Vit.Core.Module.Serialization.Qps\Vit.Core.Module.Serialization.Qps.csproj", "{8D55E47B-102B-4905-BA35-40CDD2430B54}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Temp", "Library\Sers\Sers.Core\Sers.Core.Temp\Sers.Core.Temp.csproj", "{F0FB825C-DB85-4268-8396-51CEF5AEAB50}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Module.Serialization.Qps", "Library\Sers\Sers.Core\Test\Sers.Core.Module.Serialization.Qps\Sers.Core.Module.Serialization.Qps.csproj", "{DCB42B65-E24A-43AC-9102-E7CDF9B32590}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -559,14 +559,6 @@ Global
 		{A2E07766-8290-446D-AD4E-D8277687D4C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2E07766-8290-446D-AD4E-D8277687D4C0}.Release|x86.ActiveCfg = Release|Any CPU
 		{A2E07766-8290-446D-AD4E-D8277687D4C0}.Release|x86.Build.0 = Release|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|x86.Build.0 = Release|Any CPU
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -575,6 +567,14 @@ Global
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|x86.ActiveCfg = Release|Any CPU
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|x86.Build.0 = Release|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Debug|x86.Build.0 = Debug|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -660,8 +660,8 @@ Global
 		{1B6172BF-405A-4752-B0A3-040F2E951F2A} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
 		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
 		{A2E07766-8290-446D-AD4E-D8277687D4C0} = {37633A5F-54B5-4179-8BCD-B7B422B4857C}
-		{8D55E47B-102B-4905-BA35-40CDD2430B54} = {B0C8734C-7CAC-4EA4-BF49-4ECE4876BB5D}
 		{F0FB825C-DB85-4268-8396-51CEF5AEAB50} = {C3954FC1-88A0-4915-AF47-E0B75AAAA63A}
+		{DCB42B65-E24A-43AC-9102-E7CDF9B32590} = {37633A5F-54B5-4179-8BCD-B7B422B4857C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}