Kaynağa Gözat

依赖库更新

Shun 2 yıl önce
ebeveyn
işleme
33788793ec
32 değiştirilmiş dosya ile 136 ekleme ve 51 silme
  1. 1 1
      src/YSAI.AllenBradley/YSAI.AllenBradley.csproj
  2. 1 1
      src/YSAI.Beckhoff/YSAI.Beckhoff.csproj
  3. 1 1
      src/YSAI.Can/YSAI.Can.csproj
  4. 0 10
      src/YSAI.Core.Tool/YSAI.Core.Tool.csproj
  5. 26 0
      src/YSAI.Core.Wpf.Tool/YSAI.Core.Wpf.Tool.csproj
  6. 9 0
      src/YSAI.Core.Wpf.Tool/model/SerialController.cs
  7. 8 0
      src/YSAI.Core.Wpf.Tool/view/AboutUs.xaml
  8. 20 0
      src/YSAI.Core.Wpf.Tool/view/AboutUs.xaml.cs
  9. 7 0
      src/YSAI.Core.Wpf.Tool/view/Serial.xaml
  10. 28 0
      src/YSAI.Core.Wpf.Tool/view/Serial.xaml.cs
  11. 1 1
      src/YSAI.Core/YSAI.Core.csproj
  12. 8 8
      src/YSAI.DAQ.sln
  13. 1 1
      src/YSAI.DB/YSAI.DB.csproj
  14. 1 1
      src/YSAI.Kafka/YSAI.Kafka.csproj
  15. 2 2
      src/YSAI.Log/YSAI.Log.csproj
  16. 1 1
      src/YSAI.Mewtocol/YSAI.Mewtocol.csproj
  17. 1 1
      src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj
  18. 1 1
      src/YSAI.Modbus/YSAI.Modbus.csproj
  19. 2 2
      src/YSAI.Model/YSAI.Model.csproj
  20. 1 1
      src/YSAI.Mqtt/YSAI.Mqtt.csproj
  21. 1 1
      src/YSAI.NetMQ/YSAI.NetMQ.csproj
  22. 1 1
      src/YSAI.Netty/YSAI.Netty.csproj
  23. 1 1
      src/YSAI.Omron/YSAI.Omron.csproj
  24. 1 1
      src/YSAI.Opc/YSAI.Opc.csproj
  25. 2 2
      src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj
  26. 2 2
      src/YSAI.Redis/YSAI.Redis.csproj
  27. 1 1
      src/YSAI.Rpc/YSAI.Rpc.csproj
  28. 1 1
      src/YSAI.Siemens/YSAI.Siemens.csproj
  29. 1 1
      src/YSAI.Tool.Core/YSAI.Tool.Core.csproj
  30. 1 1
      src/YSAI.Tool/MainWindowController.cs
  31. 1 4
      src/YSAI.Unility.Windows/YSAI.Unility.Windows.csproj
  32. 3 3
      src/YSAI.Unility/YSAI.Unility.csproj

+ 1 - 1
src/YSAI.AllenBradley/YSAI.AllenBradley.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6832</Version>
+    <Version>23.347.6811</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Can/YSAI.Can.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 0 - 10
src/YSAI.Core.Tool/YSAI.Core.Tool.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-</Project>

+ 26 - 0
src/YSAI.Core.Wpf.Tool/YSAI.Core.Wpf.Tool.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+		<PackageReference Include="YSAI.AllenBradley" Version="23.345.6832" />
+		<PackageReference Include="YSAI.Beckhoff" Version="23.345.6833" />
+		<PackageReference Include="YSAI.DB" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Kafka" Version="23.342.8314" />
+		<PackageReference Include="YSAI.Mewtocol" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Mitsubishi" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Modbus" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Mqtt" Version="23.345.6833" />
+		<PackageReference Include="YSAI.NetMQ" Version="23.342.8315" />
+		<PackageReference Include="YSAI.Netty" Version="23.342.8314" />
+		<PackageReference Include="YSAI.Omron" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Opc" Version="23.345.6833" />
+		<PackageReference Include="YSAI.RabbitMQ" Version="23.345.6833" />
+		<PackageReference Include="YSAI.Siemens" Version="23.345.6833" />
+	</ItemGroup>
+</Project>

+ 9 - 0
src/YSAI.Core.Wpf.Tool/model/SerialController.cs

@@ -0,0 +1,9 @@
+namespace YSAI.Core.Wpf.Tool.model
+{
+    /// <summary>
+    /// 串口通信控制器
+    /// </summary>
+    public class SerialController
+    {
+    }
+}

+ 8 - 0
src/YSAI.Core.Wpf.Tool/view/AboutUs.xaml

@@ -0,0 +1,8 @@
+<UserControl x:Class="YSAI.Core.Wpf.Tool.view.AboutUs"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf">
+    <wv2:WebView2  Name="webView" />
+</UserControl>

+ 20 - 0
src/YSAI.Core.Wpf.Tool/view/AboutUs.xaml.cs

@@ -0,0 +1,20 @@
+using Microsoft.Web.WebView2.Core;
+using System.Windows.Controls;
+
+namespace YSAI.Core.Wpf.Tool.view
+{
+    /// <summary>
+    /// AboutUs.xaml 的交互逻辑
+    /// </summary>
+    public partial class AboutUs : UserControl
+    {
+        public AboutUs()
+        {
+            InitializeComponent();
+            //设置缓存目录
+            webView.EnsureCoreWebView2Async(CoreWebView2Environment.CreateAsync(null, "cache").Result);
+            //设置地址
+            webView.Source = new Uri("http://www.yuanshan-ai.com/list/45.html");
+        }
+    }
+}

+ 7 - 0
src/YSAI.Core.Wpf.Tool/view/Serial.xaml

@@ -0,0 +1,7 @@
+<UserControl x:Class="YSAI.Core.Wpf.Tool.view.Serial"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:YSAI.Core.Wpf.Tool.view">
+</UserControl>

+ 28 - 0
src/YSAI.Core.Wpf.Tool/view/Serial.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace YSAI.Core.Wpf.Tool.view
+{
+    /// <summary>
+    /// Serial.xaml 的交互逻辑
+    /// </summary>
+    public partial class Serial : UserControl
+    {
+        public Serial()
+        {
+            InitializeComponent();
+        }
+    }
+}

+ 1 - 1
src/YSAI.Core/YSAI.Core.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6519</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 8 - 8
src/YSAI.DAQ.sln

@@ -95,7 +95,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Unility.Windows", "YSA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Core.Wpf", "YSAI.Core.Wpf\YSAI.Core.Wpf.csproj", "{FF5BDE58-1EBD-4AFF-81DE-B1B5EF7BDFC6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Core.Tool", "YSAI.Core.Tool\YSAI.Core.Tool.csproj", "{34CC550D-EB9E-456B-8926-B64F8E251B3B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Core.Wpf.Tool", "YSAI.Core.Wpf.Tool\YSAI.Core.Wpf.Tool.csproj", "{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -243,18 +243,18 @@ Global
 		{FF5BDE58-1EBD-4AFF-81DE-B1B5EF7BDFC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF5BDE58-1EBD-4AFF-81DE-B1B5EF7BDFC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF5BDE58-1EBD-4AFF-81DE-B1B5EF7BDFC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34CC550D-EB9E-456B-8926-B64F8E251B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34CC550D-EB9E-456B-8926-B64F8E251B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34CC550D-EB9E-456B-8926-B64F8E251B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34CC550D-EB9E-456B-8926-B64F8E251B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{859336BA-B7A8-45E7-BE35-72B1BB7D01B7} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
-		{3D1D4ACF-EFD0-497D-891D-527BDE7CA9A4} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
-		{C8EEBF30-365E-4F22-A58C-C68FB58E4256} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
+		{3D1D4ACF-EFD0-497D-891D-527BDE7CA9A4} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
+		{C8EEBF30-365E-4F22-A58C-C68FB58E4256} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
 		{FEA383F4-9CDD-422F-9068-200A66DF7C81} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{1EE30939-69BA-4F20-96B3-D4082C937924} = {9D8EDBBA-7A97-4D84-9B12-7FCC2F834046}
 		{FEFEFB3E-30EE-429A-B39D-F39CF1338E38} = {0A264424-1AD7-49FA-B813-D96498066479}
@@ -291,7 +291,7 @@ Global
 		{8A8EF816-E6C4-4E0B-8B92-99EE8CE85EED} = {8AB62EDF-2857-497A-889E-14A7CF88F107}
 		{297E1B53-0E64-464C-A813-965FB7EBE7C2} = {8A8EF816-E6C4-4E0B-8B92-99EE8CE85EED}
 		{FF5BDE58-1EBD-4AFF-81DE-B1B5EF7BDFC6} = {8A8EF816-E6C4-4E0B-8B92-99EE8CE85EED}
-		{34CC550D-EB9E-456B-8926-B64F8E251B3B} = {8A8EF816-E6C4-4E0B-8B92-99EE8CE85EED}
+		{659CAF5D-ECCA-4F3A-AC9E-B3C59E3B14CC} = {8A8EF816-E6C4-4E0B-8B92-99EE8CE85EED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

+ 1 - 1
src/YSAI.DB/YSAI.DB.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.8314</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 2 - 2
src/YSAI.Log/YSAI.Log.csproj

@@ -3,14 +3,14 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.10146</Version>
+    <Version>23.347.7111</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DescriptionType>扩展工具</DescriptionType>
+    <DescriptionType>核心组件</DescriptionType>
     <DescriptionName>Log</DescriptionName>
     <DescriptionDetails>Verbose [详细信息]、Debug [调试]、Info [信息]、Warning [警告]、Error [异常或错误]、Fatal [致命错误或异常]</DescriptionDetails>
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>

+ 1 - 1
src/YSAI.Mewtocol/YSAI.Mewtocol.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Modbus/YSAI.Modbus.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 2 - 2
src/YSAI.Model/YSAI.Model.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.7875</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="YSAI.Log" Version="23.333.10146" />
-    <PackageReference Include="YSAI.Unility" Version="23.342.7559" />
+    <PackageReference Include="YSAI.Unility" Version="23.347.6737" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.8315</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Netty/YSAI.Netty.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.8314</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Omron/YSAI.Omron.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Opc/YSAI.Opc.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 2 - 2
src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,7 +16,7 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="RabbitMQ.Client" Version="6.8.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Include="YSAI.Model" Version="23.342.7875" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Redis/YSAI.Redis.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.8314</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,7 +16,7 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.10" />
     <PackageReference Include="YSAI.Model" Version="23.342.7875" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Rpc/YSAI.Rpc.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.8314</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Siemens/YSAI.Siemens.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.345.6833</Version>
+    <Version>23.347.6812</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 1 - 1
src/YSAI.Tool.Core/YSAI.Tool.Core.csproj

@@ -16,7 +16,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
 	</ItemGroup>
 
 	<ItemGroup>

+ 1 - 1
src/YSAI.Tool/MainWindowController.cs

@@ -46,7 +46,7 @@ namespace YSAI.Tool
                             new NavigationViewItem(string.Format("{0,-8}{1}", "[ 客户端 ]", "UA"), SymbolRegular.DocumentTextToolbox24, typeof(OpcUaClientTool)),
                             new NavigationViewItem(string.Format("{0,-8}{1}", "[ 服务端 ]", "UA"), SymbolRegular.DesktopToolbox24, typeof(OpcUaServiceTool)),
                             new NavigationViewItem(string.Format("{0,-8}{1}", "[ 客户端 ]", "DA"), SymbolRegular.ClockToolbox24, null),
-                            new NavigationViewItem(string.Format("{0,-8}{1}", "[  HTTP  ]", "DA"), SymbolRegular.BookToolbox24, typeof(OpcDaHttpClientTool))
+                            new NavigationViewItem(string.Format("{0,-8}{1}", "[ HTTP ]", "DA"), SymbolRegular.BookToolbox24, typeof(OpcDaHttpClientTool))
                         }
                   },
                   new NavigationViewItem()

+ 1 - 4
src/YSAI.Unility.Windows/YSAI.Unility.Windows.csproj

@@ -7,15 +7,12 @@
 	  <UseWPF>true</UseWPF>
 	  <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\YSAI.Unility\YSAI.Unility.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.2" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NPOI" Version="2.6.2" />
 		<PackageReference Include="System.Speech" Version="8.0.0" />
 		<PackageReference Include="YSAI.Log" Version="23.333.10146" />
+		<PackageReference Include="YSAI.Unility" Version="23.347.6737" />
 	</ItemGroup>
 </Project>

+ 3 - 3
src/YSAI.Unility/YSAI.Unility.csproj

@@ -3,20 +3,20 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.342.7559</Version>
+    <Version>23.347.7111</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DescriptionType>扩展工具</DescriptionType>
+    <DescriptionType>核心组件</DescriptionType>
     <DescriptionName>Unility</DescriptionName>
     <DescriptionDetails>字节、枚举、文件、字符串、验证、比对、转换、反射、Json、Xml、Ftp、System ...</DescriptionDetails>
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CompareNETObjects" Version="4.82.0" />
+    <PackageReference Include="CompareNETObjects" Version="4.83.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>