g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 10:50:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: 10.11.71

Browse Source
This commit is contained in:
2248356998 qq.com
2025-09-26 11:51:05 +08:00
parent b2ea9f99b9
commit 68e5a9c546
7 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<PluginVersion>10.11.70</PluginVersion> <PluginVersion>10.11.71</PluginVersion>
<ProPluginVersion>10.11.70</ProPluginVersion> <ProPluginVersion>10.11.71</ProPluginVersion>
<DefaultVersion>10.11.70</DefaultVersion> <DefaultVersion>10.11.71</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion> <AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion> <SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<NET8Version>8.0.20</NET8Version> <NET8Version>8.0.20</NET8Version>

7
src/Foundation/ThingsGateway.Foundation/DataHandleAdapter/DeviceSingleStreamDataHandleAdapter.cs
View File

@@ -179,7 +179,12 @@ public class DeviceSingleStreamDataHandleAdapter<TRequest> : CustomDataHandlingA
{ {
throw new Exception($"Unable to convert {nameof(requestInfo)} to {nameof(ISendMessage)}"); throw new Exception($"Unable to convert {nameof(requestInfo)} to {nameof(ISendMessage)}");
} }
var span = writer.GetSpan(sendMessage.MaxLength); Span<byte> span = default;
if (Logger?.LogLevel <= LogLevel.Trace)
{
span = writer.GetSpan(sendMessage.MaxLength);
}
sendMessage.Build(ref writer); sendMessage.Build(ref writer);
if (Logger?.LogLevel <= LogLevel.Trace) if (Logger?.LogLevel <= LogLevel.Trace)
{ {

2
src/Plugin/ThingsGateway.Foundation.Benchmark/Benchmark/ModbusBenchmark.cs
View File

@@ -32,7 +32,7 @@ using ModbusMaster = ThingsGateway.Foundation.Modbus.ModbusMaster;
namespace ThingsGateway.Foundation; namespace ThingsGateway.Foundation;
[SimpleJob(RuntimeMoniker.Net80)] [SimpleJob(RuntimeMoniker.Net80)]
[SimpleJob(RuntimeMoniker.Net10_0)] //[SimpleJob(RuntimeMoniker.Net10_0)]
[MemoryDiagnoser] [MemoryDiagnoser]
public class ModbusBenchmark : IDisposable public class ModbusBenchmark : IDisposable
{ {

53
src/Plugin/ThingsGateway.Foundation.Benchmark/Benchmark/S7Benchmark.cs
View File

@@ -24,8 +24,8 @@ using TouchSocket.Core;
namespace ThingsGateway.Foundation; namespace ThingsGateway.Foundation;
//[SimpleJob(RuntimeMoniker.Net80)] [SimpleJob(RuntimeMoniker.Net80)]
[SimpleJob(RuntimeMoniker.Net10_0)] //[SimpleJob(RuntimeMoniker.Net10_0)]
[MemoryDiagnoser] [MemoryDiagnoser]
[BaselineColumn] [BaselineColumn]
[RankColumn] [RankColumn]
@@ -67,7 +67,7 @@ public class S7Benchmark : IDisposable
} }
for (int i = 0; i < Program.ClientCount; i++) for (int i = 0; i < Program.ClientCount; i++)
{ {
var plc = new Plc(CpuType.S7300, "127.0.0.1", 102, 0, 0); var plc = new Plc(CpuType.S71500, "127.0.0.1", 102, 0, 0);
await plc.OpenAsync();//打开plc连接 await plc.OpenAsync();//打开plc连接
await plc.ReadAsync(DataType.Memory, 1, 0, VarType.Byte, 100); await plc.ReadAsync(DataType.Memory, 1, 0, VarType.Byte, 100);
plcs.Add(plc); plcs.Add(plc);
@@ -95,30 +95,29 @@ public class S7Benchmark : IDisposable
await Task.WhenAll(tasks); await Task.WhenAll(tasks);
} }
//并发失败 [Benchmark]
//[Benchmark] public async Task HslCommunication()
//public async Task HslCommunication() {
//{ List<Task> tasks = new List<Task>();
// List<Task> tasks = new List<Task>(); foreach (var siemensS7Net in siemensS7Nets)
// foreach (var siemensS7Net in siemensS7Nets) {
// { for (int i = 0; i < Program.TaskNumberOfItems; i++)
// for (int i = 0; i < Program.TaskNumberOfItems; i++) {
// { tasks.Add(Task.Run(async () =>
// tasks.Add(Task.Run(async () => {
// { for (int i = 0; i < Program.NumberOfItems; i++)
// for (int i = 0; i < Program.NumberOfItems; i++) {
// { var result = await siemensS7Net.ReadAsync("M0", 100);
// var result = await siemensS7Net.ReadAsync("M0", 100); if (!result.IsSuccess)
// if (!result.IsSuccess) {
// { throw new Exception(result.Message);
// throw new Exception(result.Message); }
// } }
// } }));
// })); }
// } }
// } await Task.WhenAll(tasks);
// await Task.WhenAll(tasks); }
//}

2
src/Plugin/ThingsGateway.Foundation.Benchmark/ThingsGateway.Foundation.Benchmark.csproj
View File

@@ -43,7 +43,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.4" /> <PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
<PackageReference Include="HslCommunication" Version="12.5.1" /> <PackageReference Include="HslCommunication" Version="12.5.1" />
<PackageReference Include="Longbow.Modbus" Version="9.1.0" /> <PackageReference Include="Longbow.Modbus" Version="9.1.1" />
<PackageReference Include="NModbus" Version="3.0.81" /> <PackageReference Include="NModbus" Version="3.0.81" />
<PackageReference Include="NModbus.Serial" Version="3.0.81" /> <PackageReference Include="NModbus.Serial" Version="3.0.81" />
<PackageReference Include="S7netplus" Version="0.20.0" /> <PackageReference Include="S7netplus" Version="0.20.0" />

6
src/Plugin/ThingsGateway.Plugin.OpcUa/Directory.build.targets
View File

@@ -12,6 +12,7 @@
<PkgOPCFoundation_NetStandard_Opc_Ua_ClientPackageFiles Include="$(PkgOPCFoundation_NetStandard_Opc_Ua_Client)\lib\net8.0\*.*" /> <PkgOPCFoundation_NetStandard_Opc_Ua_ClientPackageFiles Include="$(PkgOPCFoundation_NetStandard_Opc_Ua_Client)\lib\net8.0\*.*" />
<PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypesPackageFiles Include="$(PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypes)\lib\net8.0\*.*" /> <PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypesPackageFiles Include="$(PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypes)\lib\net8.0\*.*" />
<PkgSystem_Formats_Asn1PackageFiles Include="$(PkgSystem_Formats_Asn1)\lib\net8.0\*.*" /> <PkgSystem_Formats_Asn1PackageFiles Include="$(PkgSystem_Formats_Asn1)\lib\net8.0\*.*" />
<PkgBitFaster_CachingPackageFiles Include="$(PkgBitFaster_Caching)\lib\net6.0\*.*" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
@@ -23,6 +24,7 @@
<Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_ServerPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" /> <Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_ServerPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_Security_CertificatesPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" /> <Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_Security_CertificatesPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgSystem_Formats_Asn1PackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" /> <Copy SourceFiles="@(PkgSystem_Formats_Asn1PackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgBitFaster_CachingPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
<!--<Copy SourceFiles="@(PkgThingsGateway_Foundation_OpcUaPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />--> <!--<Copy SourceFiles="@(PkgThingsGateway_Foundation_OpcUaPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />-->
<Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_ClientPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" /> <Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_ClientPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypesPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" /> <Copy SourceFiles="@(PkgOPCFoundation_NetStandard_Opc_Ua_Client_ComplexTypesPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
@@ -36,6 +38,10 @@
<Pack>true</Pack> <Pack>true</Pack>
<PackagePath>Content</PackagePath> <PackagePath>Content</PackagePath>
</Content> </Content>
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*BitFaster*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
</ItemGroup> </ItemGroup>
</Target> </Target>

4
src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUa.csproj
View File

@@ -48,6 +48,10 @@
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" Version="1.5.377.21" GeneratePathProperty="true"> <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" Version="1.5.377.21" GeneratePathProperty="true">
<PrivateAssets>contentFiles;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets> <PrivateAssets>contentFiles;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="BitFaster.Caching" Version="2.5.4" GeneratePathProperty="true">
<PrivateAssets>contentFiles;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</PackageReference>
<!--<PackageReference Include="System.Formats.Asn1" Version="8.0.2" GeneratePathProperty="true"> <!--<PackageReference Include="System.Formats.Asn1" Version="8.0.2" GeneratePathProperty="true">
<PrivateAssets>contentFiles;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets> <PrivateAssets>contentFiles;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>