调整依赖，更新版本1.2.1

2023-04-01 15:45:02 +08:00
parent 41308cb2dd
commit 7e1221028f
20 changed files with 26 additions and 27 deletions
--- a/src/Plugins/ThingsGateway.Foundation.Adapter.Modbus/ThingsGateway.Foundation.Adapter.Modbus.csproj
+++ b/src/Plugins/ThingsGateway.Foundation.Adapter.Modbus/ThingsGateway.Foundation.Adapter.Modbus.csproj
@@ -4,7 +4,7 @@
 		<LangVersion>latestMajor</LangVersion>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 		<TargetFrameworks>net4.6.2;net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Title>ThingsGateway.Foundation.Adapter.Modbus</Title>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Authors>Diego</Authors>
--- a/src/Plugins/ThingsGateway.Foundation.Adapter.OPCDA/ThingsGateway.Foundation.Adapter.OPCDA.csproj
+++ b/src/Plugins/ThingsGateway.Foundation.Adapter.OPCDA/ThingsGateway.Foundation.Adapter.OPCDA.csproj
@@ -4,7 +4,7 @@
 		<LangVersion>latestMajor</LangVersion>
 		<TargetFrameworks>net4.6.2;net6.0;net7.0</TargetFrameworks>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Platforms>AnyCPU</Platforms>
 		<OutputType>Library</OutputType>
 		
--- a/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.csproj
+++ b/src/Plugins/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.csproj
@@ -4,7 +4,7 @@
 		<LangVersion>latestMajor</LangVersion>
 		<TargetFrameworks>net4.6.2;net6.0;net7.0</TargetFrameworks>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Platforms>AnyCPU</Platforms>
 		<OutputType>Library</OutputType>
 		
--- a/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/ThingsGateway.Foundation.Adapter.Siemens.csproj
+++ b/src/Plugins/ThingsGateway.Foundation.Adapter.Siemens/ThingsGateway.Foundation.Adapter.Siemens.csproj
@@ -4,7 +4,7 @@
 		<LangVersion>latestMajor</LangVersion>
 		<TargetFrameworks>net4.6.2;net6.0;net7.0</TargetFrameworks>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Title>ThingsGateway.Foundation.Adapter.Siemens</Title>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Authors>Diego</Authors>
--- a/src/Plugins/ThingsGateway.Foundation.Tests/ThingsGateway.Foundation.Tests.csproj
+++ b/src/Plugins/ThingsGateway.Foundation.Tests/ThingsGateway.Foundation.Tests.csproj
@@ -7,7 +7,7 @@

 		<IsPackable>false</IsPackable>
 		<Platforms>AnyCPU;x86</Platforms>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 	</PropertyGroup>

 	<ItemGroup>
--- a/src/Plugins/ThingsGateway.Modbus/ThingsGateway.Modbus.csproj
+++ b/src/Plugins/ThingsGateway.Modbus/ThingsGateway.Modbus.csproj
@@ -5,7 +5,7 @@
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
--- a/src/Plugins/ThingsGateway.Mqtt/ThingsGateway.Mqtt.csproj
+++ b/src/Plugins/ThingsGateway.Mqtt/ThingsGateway.Mqtt.csproj
@@ -5,7 +5,7 @@
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/src/Plugins/ThingsGateway.OPCDA/ThingsGateway.OPCDA.csproj
+++ b/src/Plugins/ThingsGateway.OPCDA/ThingsGateway.OPCDA.csproj
@@ -5,7 +5,7 @@
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/src/Plugins/ThingsGateway.OPCUA/ThingsGateway.OPCUA.csproj
+++ b/src/Plugins/ThingsGateway.OPCUA/ThingsGateway.OPCUA.csproj
@@ -5,7 +5,7 @@
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/src/Plugins/ThingsGateway.RabbitMQ/ThingsGateway.RabbitMQ.csproj
+++ b/src/Plugins/ThingsGateway.RabbitMQ/ThingsGateway.RabbitMQ.csproj
@@ -5,7 +5,7 @@
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/src/Plugins/ThingsGateway.Siemens/ThingsGateway.Siemens.csproj
+++ b/src/Plugins/ThingsGateway.Siemens/ThingsGateway.Siemens.csproj
@@ -5,7 +5,7 @@
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
--- a/src/ThingsGateway.Application/ThingsGateway.Application.csproj
+++ b/src/ThingsGateway.Application/ThingsGateway.Application.csproj
@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>

--- a/src/ThingsGateway.Core/ThingsGateway.Core.csproj
+++ b/src/ThingsGateway.Core/ThingsGateway.Core.csproj
@@ -3,22 +3,20 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.28" />
-		<PackageReference Include="Furion.Pure" Version="4.8.7.28" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.31" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.31" />
+		<PackageReference Include="Furion.Pure" Version="4.8.7.31" />
 		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.3" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.62" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.63" />
 		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
 		<PackageReference Include="NewLife.Core" Version="10.2.2023.301" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 		<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
 	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.28" />
-	</ItemGroup>
 </Project>
--- a/src/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
+++ b/src/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
@@ -7,7 +7,7 @@
 		<NoWarn>SYSLIB0014;CS8981;</NoWarn>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>

-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Title>ThingsGateway.Foundation</Title>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Authors>Diego</Authors>
@@ -30,7 +30,6 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.39" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="TouchSocket" Version="1.3.0" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
--- a/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
+++ b/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
@@ -3,7 +3,7 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>

--- a/src/ThingsGateway.Web.Foundation/ThingsGateway.Web.Foundation.csproj
+++ b/src/ThingsGateway.Web.Foundation/ThingsGateway.Web.Foundation.csproj
@@ -3,13 +3,15 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>

 	<ItemGroup>
+		<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.39" />
 		<PackageReference Include="Hardware.Info" Version="11.0.0" />
 		<PackageReference Include="CS-Script" Version="4.6.5" />
+		<!--CS-Script与Furion冲突，直接安装覆盖版本-->
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
 	</ItemGroup>

--- a/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj
+++ b/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj
@@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<NoWarn>BL0005;CS0168;</NoWarn>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>
--- a/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj
+++ b/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj
@@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<NoWarn>BL0005;CS0168;</NoWarn>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>
--- a/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj
+++ b/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj
@@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<NoWarn>BL0005;CS0168;</NoWarn>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 	</PropertyGroup>
--- a/src/ThingsGateway.Web.Server/ThingsGateway.Web.Server.csproj
+++ b/src/ThingsGateway.Web.Server/ThingsGateway.Web.Server.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
 		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<!--<ServerGarbageCollection>false</ServerGarbageCollection>-->