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

更新依赖，添加bacnet,HJ212

Browse Source
This commit is contained in:
Diego
2024-11-25 11:32:28 +08:00
parent 9847249611
commit 41b59d322a
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Directory.Build.props
View File

@@ -2,8 +2,8 @@
<PropertyGroup>
<AdminVersion>7.2.0.22</AdminVersion>
<PluginVersion>9.0.2.16</PluginVersion>
<ProPluginVersion>9.0.2.39</ProPluginVersion>
<PluginVersion>9.0.2.18</PluginVersion>
<ProPluginVersion>9.0.2.45</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

4
src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
View File

@@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0" />
<PackageReference Include="ThingsGateway.NewLife.X" Version="$(AdminVersion)" />
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.4" />
</ItemGroup>
</Project>

4
src/Gateway/ThingsGateway.Gateway.Application/Plugin/Collect/CollectBase.cs
View File

@@ -233,12 +233,12 @@ public abstract class CollectBase : DriverBase
// 如果所有方法和变量读取都成功，则清零错误计数器
if (readResultCount.deviceMethodsVariableFailedNum == 0 && readResultCount.deviceSourceVariableFailedNum == 0 && (readResultCount.deviceMethodsVariableSuccessNum != 0 || readResultCount.deviceSourceVariableSuccessNum != 0))
{
ScriptVariableRun(cancellationToken);
//只有成功读取一次，失败次数都会清零
CurrentDevice.SetDeviceStatus(TimerX.Now, 0);
}
ScriptVariableRun(cancellationToken);
#region 执行方法

2
src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
View File

@@ -4,7 +4,7 @@
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.3" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.5" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0" />
<PackageReference Include="ThingsGateway.Admin.Razor" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj" />

8
src/ThingsGateway.Server/targets/CustomPlugin.targets
View File

@@ -1,6 +1,8 @@
<Project>
<ItemGroup>
<PackageReference Include="ThingsGateway.Plugin.HJ212" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false" IncludeAssets=" native;" />
<PackageReference Include="ThingsGateway.Plugin.BACnet" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false" IncludeAssets=" native;" />
<!--AllenBradleyCip 插件-->
<PackageReference Include="ThingsGateway.Plugin.AllenBradleyCip" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false" IncludeAssets=" native;" />
<!--DCON 插件-->
@@ -34,6 +36,8 @@
<Target Name="CopyCustomPluginNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<PkgThingsGateway_Plugin_HJ212PackageFiles Include="$(PkgThingsGateway_Plugin_HJ212)\Content\net6.0\**\*.*" />
<PkgThingsGateway_Plugin_BACnetPackageFiles Include="$(PkgThingsGateway_Plugin_BACnet)\Content\net6.0\**\*.*" />
<PkgThingsGateway_Plugin_AllenBradleyCipPackageFiles Include="$(PkgThingsGateway_Plugin_AllenBradleyCip)\Content\net6.0\**\*.*" />
<PkgThingsGateway_Plugin_DCONPackageFiles Include="$(PkgThingsGateway_Plugin_DCON)\Content\net6.0\**\*.*" />
<PkgThingsGateway_Plugin_EDPF_NTPackageFiles Include="$(PkgThingsGateway_Plugin_EDPF_NT)\Content\net6.0\**\*.*" />
@@ -58,7 +62,9 @@
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HJ212PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_BACnetPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_AllenBradleyCipPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DCONPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_EDPF_NTPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.0.27</Version>
<Version>7.2.0.28</Version>
</PropertyGroup>
<ItemGroup>