Explorar o código

依赖库更新

Shun %!s(int64=2) %!d(string=hai) anos
pai
achega
aebf3c1615

+ 22 - 24
src/YSAI.AllenBradley/YSAI.AllenBradley.csproj

@@ -1,24 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>AllenBradley</DescriptionName_En>
-		<DescriptionName_Cn>罗克韦尔</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21145</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>
+    <DescriptionName_En>AllenBradley</DescriptionName_En>
+    <DescriptionName_Cn>罗克韦尔</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+</Project>

+ 24 - 27
src/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -1,29 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Beckhoff</DescriptionName_En>
-		<DescriptionName_Cn>倍福</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-
-	<!--<ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Beckhoff</DescriptionName_En>
+    <DescriptionName_Cn>倍福</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+  <!--<ItemGroup>
     <ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
   </ItemGroup>-->
-
-</Project>
+</Project>

+ 19 - 24
src/YSAI.Can/YSAI.Can.csproj

@@ -1,35 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>CAN</DescriptionName_En>
-		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>CAN</DescriptionName_En>
+    <DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Kvaser.CanLib">
       <HintPath>..\YSAI.Lib\YSAI.Can.Lib\Kvaser.CanLib.dll</HintPath>
     </Reference>
   </ItemGroup>
-
   <!--<ItemGroup>
     <ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
   </ItemGroup>-->
-
-</Project>
+</Project>

+ 26 - 29
src/YSAI.Core/YSAI.Core.csproj

@@ -1,29 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Core</DescriptionName_En>
-		<DescriptionName_Cn>特性、数据结构、处理、接口、Redis、反射、脚本、订阅、虚拟地址、TCP、UDP、HTTP、WS、串口</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
-		<PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
-		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
-		<PackageReference Include="YSAI.Log" Version="23.318.12493" />
-		<PackageReference Include="YSAI.Unility" Version="23.318.12506" />
-	</ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Core</DescriptionName_En>
+    <DescriptionName_Cn>特性、数据结构、处理、接口、Redis、反射、脚本、订阅、虚拟地址、TCP、UDP、HTTP、WS、串口</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
+    <PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="YSAI.Log" Version="23.318.12493" />
+    <PackageReference Include="YSAI.Unility" Version="23.318.12506" />
+  </ItemGroup>
+</Project>

+ 9 - 2
src/YSAI.DAQ.sln

@@ -117,9 +117,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mewtocol", "YSAI.Mewto
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mewtocol.Pack", "YSAI.Mewtocol.Pack\YSAI.Mewtocol.Pack.csproj", "{586340C5-C724-456D-A385-F8265D7E9FBA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Siemens", "YSAI.Siemens\YSAI.Siemens.csproj", "{1F68D7B4-3565-4278-A207-8724303EEF60}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Siemens", "YSAI.Siemens\YSAI.Siemens.csproj", "{1F68D7B4-3565-4278-A207-8724303EEF60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Siemens.Pack", "YSAI.Siemens.Pack\YSAI.Siemens.Pack.csproj", "{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Siemens.Pack", "YSAI.Siemens.Pack\YSAI.Siemens.Pack.csproj", "{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.VT", "YSAI.VT\YSAI.VT.csproj", "{18BC89C3-3247-413C-9199-934741507CA0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -327,6 +329,10 @@ Global
 		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18BC89C3-3247-413C-9199-934741507CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18BC89C3-3247-413C-9199-934741507CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18BC89C3-3247-413C-9199-934741507CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18BC89C3-3247-413C-9199-934741507CA0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -386,6 +392,7 @@ Global
 		{586340C5-C724-456D-A385-F8265D7E9FBA} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{1F68D7B4-3565-4278-A207-8724303EEF60} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
+		{18BC89C3-3247-413C-9199-934741507CA0} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

+ 28 - 30
src/YSAI.DB/YSAI.DB.csproj

@@ -1,32 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>DB</DescriptionName_En>
-		<DescriptionName_Cn>数据库</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Dapper" Version="2.1.21" />
-		<PackageReference Include="MySql.Data" Version="8.2.0" />
-		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
-		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-	<!--<ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>DB</DescriptionName_En>
+    <DescriptionName_Cn>数据库</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Dapper" Version="2.1.21" />
+    <PackageReference Include="MySql.Data" Version="8.2.0" />
+    <PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-</Project>
+</Project>

+ 21 - 24
src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -1,30 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Kafka</DescriptionName_En>
-		<DescriptionName_Cn></DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Kafka</DescriptionName_En>
+    <DescriptionName_Cn>
+    </DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-	
-	<!--<ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-
-</Project>
+</Project>

+ 24 - 26
src/YSAI.Log/YSAI.Log.csproj

@@ -1,26 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Log</DescriptionName_En>
-		<DescriptionName_Cn>Verbose [详细信息]、Debug [调试]、Info [信息]、Warning [警告]、Error [异常或错误]、Fatal [致命错误或异常]</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-<ItemGroup>
-		<PackageReference Include="Serilog" Version="3.1.1" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
-		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-	</ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Log</DescriptionName_En>
+    <DescriptionName_Cn>Verbose [详细信息]、Debug [调试]、Info [信息]、Warning [警告]、Error [异常或错误]、Fatal [致命错误或异常]</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+</Project>

+ 23 - 26
src/YSAI.Mewtocol/YSAI.Mewtocol.csproj

@@ -1,26 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Mewtocol</DescriptionName_En>
-		<DescriptionName_Cn>松下</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Mewtocol.NET" Version="0.8.0" />
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Mewtocol</DescriptionName_En>
+    <DescriptionName_Cn>松下</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Mewtocol.NET" Version="0.8.0" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+</Project>

+ 19 - 22
src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -1,25 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Mitsubishi</DescriptionName_En>
-		<DescriptionName_Cn>三菱</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Mitsubishi</DescriptionName_En>
+    <DescriptionName_Cn>三菱</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
-</Project>
+</Project>

+ 21 - 25
src/YSAI.Modbus/YSAI.Modbus.csproj

@@ -1,31 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Modbus</DescriptionName_En>
-		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Modbus</DescriptionName_En>
+    <DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.81" />
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
-	<!--<ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-
-</Project>
+</Project>

+ 21 - 24
src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -1,31 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Mqtt</DescriptionName_En>
-		<DescriptionName_Cn></DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Mqtt</DescriptionName_En>
+    <DescriptionName_Cn>
+    </DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
-	<!--<ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-
-</Project>
+</Project>

+ 22 - 25
src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -1,28 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
-		<DescriptionType>转发协议</DescriptionType>
-		<DescriptionName_En>NetMQ</DescriptionName_En>
-		<DescriptionName_Cn></DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-
-	<ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
+    <DescriptionType>转发协议</DescriptionType>
+    <DescriptionName_En>NetMQ</DescriptionName_En>
+    <DescriptionName_Cn>
+    </DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
-</Project>
+</Project>

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

@@ -1,25 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Netty</DescriptionName_En>
-		<DescriptionName_Cn></DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
-		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Netty</DescriptionName_En>
+    <DescriptionName_Cn>
+    </DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
+    <PackageReference Include="DotNetty.Transport" Version="0.7.5" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+</Project>

+ 22 - 24
src/YSAI.Omron/YSAI.Omron.csproj

@@ -1,24 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Omron</DescriptionName_En>
-		<DescriptionName_Cn>欧姆龙</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Omron</DescriptionName_En>
+    <DescriptionName_Cn>欧姆龙</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+</Project>

+ 21 - 28
src/YSAI.Opc/YSAI.Opc.csproj

@@ -1,36 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Opc</DescriptionName_En>
-		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Opc</DescriptionName_En>
+    <DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
-	<PackageReference Include="YSAI.Core" Version="23.317.31271" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-
-
-	<!--<ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-
   <ItemGroup>
     <Folder Include="da\lib\" />
   </ItemGroup>
-
   <ItemGroup>
     <None Update="Opc.Ua.Client.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -39,6 +34,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
-
-</Project>
+</Project>

+ 16 - 18
src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -1,29 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-	<DescriptionName_En>RabbitMQ</DescriptionName_En>
-	<DescriptionName_Cn></DescriptionName_Cn>
-	<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-	<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>RabbitMQ</DescriptionName_En>
+    <DescriptionName_Cn>
+    </DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
   </PropertyGroup>
-	
-
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
     <PackageReference Include="YSAI.Core" Version="23.317.31271" />
   </ItemGroup>
-	<!--<ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-</Project>
+</Project>

+ 23 - 27
src/YSAI.Siemens/YSAI.Siemens.csproj

@@ -1,30 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Siemens</DescriptionName_En>
-		<DescriptionName_Cn>西门子</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="S7netplus" Version="0.20.0" />
-		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
-	</ItemGroup>
-
-	<!--<ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Siemens</DescriptionName_En>
+    <DescriptionName_Cn>西门子</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="S7netplus" Version="0.20.0" />
+    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
+  </ItemGroup>
+  <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-
-</Project>
+</Project>

+ 22 - 25
src/YSAI.Unility/YSAI.Unility.csproj

@@ -1,25 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>$([System.DateTime]::UtcNow.ToString("yy")).$([System.DateTime]::UtcNow.DayOfYear.ToString("0")).$([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds.ToString("0"))</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>
-		<DescriptionName_En>Unility</DescriptionName_En>
-		<DescriptionName_Cn>字节、枚举、文件、字符串、验证、比对、转换、反射、Json、Xml、Ftp、System ...</DescriptionName_Cn>
-		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
-		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-	</ItemGroup>
-	
-	
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>23.318.21146</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>
+    <DescriptionName_En>Unility</DescriptionName_En>
+    <DescriptionName_Cn>字节、枚举、文件、字符串、验证、比对、转换、反射、Json、Xml、Ftp、System ...</DescriptionName_Cn>
+    <Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType):$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+    <Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType):$(DescriptionName_En)</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+</Project>

+ 89 - 0
src/YSAI.VT/Program.cs

@@ -0,0 +1,89 @@
+using YSAI.Log;
+using YSAI.Unility;
+
+namespace YSAI.VT
+{
+    /// <summary>
+    /// 版本工具
+    /// </summary>
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            //需要版本更新的库
+            //【注意:更新完后请注释掉】
+            List<string> strings = new List<string>
+            {
+                //"YSAI.Core",
+                //"YSAI.Log",
+                //"YSAI.Unility",
+                //"YSAI.AllenBradley",
+                //"YSAI.Beckhoff",
+                //"YSAI.Can",
+                //"YSAI.DB",
+                //"YSAI.Mewtocol",
+                //"YSAI.Mitsubishi",
+                //"YSAI.Modbus",
+                //"YSAI.Omron",
+                //"YSAI.Opc",
+                //"YSAI.Siemens",
+                //"YSAI.Kafka",
+                //"YSAI.Mqtt",
+                //"YSAI.NetMQ",
+                //"YSAI.Netty",
+                //"YSAI.RabbitMQ",
+            };
+
+            if (strings.Count == 0)
+            {
+                LogHelper.Error("不存在要更新版本的库名称");
+                return;
+            }
+
+            //按规定格式检索
+            string searchPattern = "YSAI.*.csproj";
+
+            //xml路径
+            string xmlPath = "/Project/PropertyGroup/Version";
+
+            //格式
+            string format = "{0}.csproj";
+
+            //检索成功的路径
+            List<(string path, string name)> paths = new List<(string, string)>();
+
+            //获取解决方案路径
+            DirectoryInfo directory = new DirectoryInfo(Directory.GetCurrentDirectory());
+            while (directory != null && !directory.GetFiles("*.sln").Any())
+            {
+                directory = directory.Parent;
+                continue;
+            }
+
+            //检索里面的文件
+            List<string> libs = Directory.GetFiles(directory.FullName, searchPattern, SearchOption.AllDirectories).ToList();
+            //检索文件
+            foreach (var lib in libs)
+            {
+                foreach (var name in strings)
+                {
+                    string str = string.Format(format, name);
+
+                    if (lib.Contains(str))
+                    {
+                        paths.Add((lib, name));
+                    }
+                }
+            }
+
+            foreach (var var in paths)
+            {
+                string ver = $"{DateTime.UtcNow.ToString("yy")}.{DateTime.UtcNow.DayOfYear.ToString("0")}.{DateTime.UtcNow.TimeOfDay.TotalSeconds.ToString("0")}";
+                LogHelper.Info($"{var.name} - Ver:{ver}");
+                XmlTool.Update(var.path, xmlPath, string.Empty, ver);
+            }
+
+            LogHelper.Info("~~~~~~~~~~版本更新完成~~~~~~~~~~");
+        }
+    }
+}

+ 15 - 0
src/YSAI.VT/YSAI.VT.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Log\YSAI.Log.csproj" />
+    <ProjectReference Include="..\YSAI.Unility\YSAI.Unility.csproj" />
+  </ItemGroup>
+
+</Project>