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

更新构建脚本

Browse Source
This commit is contained in:
Diego
2025-01-06 11:12:04 +08:00
parent bd32c9f49e
commit 3279bc0580
11 changed files with 152 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Admin

Submodule Admin updated: c6d87185bd...2641018700

4
src/Directory.Build.props
View File

@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<AdminVersion>7.2.0.63</AdminVersion>
<GatewayVersion>7.2.3.6</GatewayVersion>
<AdminVersion>7.2.0.64</AdminVersion>
<GatewayVersion>7.2.3.9</GatewayVersion>
<PluginVersion>9.0.3.8</PluginVersion>
<ProPluginVersion>9.0.3.6</ProPluginVersion>
</PropertyGroup>

3
src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
View File

@@ -2,7 +2,8 @@
<Import Project="$(SolutionDir)Version.props" />
<!--<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\PluginContext.targets" />
<!--<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\CustomPlugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\Custom.targets" />
<PropertyGroup>

5
src/ThingsGateway.Server/ThingsGateway.Server.csproj
View File

@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="$(SolutionDir)Version.props" />
<Import Project="targets\Plugin.targets" />
<Import Project="targets\PluginContext.targets" />
<!--<Import Project="targets\Plugin.targets" />-->
<Import Project="targets\CustomPlugin.targets" />
<Import Project="targets\Custom.targets" />
<!--<Import Project="targets\Admin.targets" />-->
<Import Project="targets\OtherPlugin.targets" />
<!--<Import Project="targets\OtherPlugin.targets" />-->
<!--<Import Project="targets\OtherPlugin1.targets" />-->
<PropertyGroup>
<CustomTargetFramework>$(TargetFramework)</CustomTargetFramework>

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

@@ -18,14 +18,14 @@
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttYINGKEPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.MqttYINGKE%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttYINGKEPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HUANANSFSKPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.HUANANSFSK%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_YPSFSKPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.YPSFSK%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HUANANSFSKPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_YPSFSKPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
</Target>

4
src/ThingsGateway.Server/targets/OtherPlugin1.targets
View File

@@ -11,11 +11,11 @@
<PkgThingsGateway_Plugin_ModbusC1PackageFiles Include="$(PkgThingsGateway_Plugin_ModbusC1)\Content\net6.0\**\*.*" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusC1PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.ModbusC1%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusC1PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
</Target>

21
src/ThingsGateway.Server/targets/Plugin.targets
View File

@@ -1,22 +1,7 @@
<Project>
<!--插件隔离-->
<Target Name="PostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<PluginsFiles Include="bin\$(Configuration)\$(TargetFramework)\Plugins\**" />
<GatewayPluginsFiles Include="bin\$(Configuration)\$(TargetFramework)\GatewayPlugins\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(PluginsFiles)" DestinationFolder="$(PublishDir)Plugins\%(RecursiveDir)" />
<Copy SourceFiles="@(GatewayPluginsFiles)" DestinationFolder="$(PublishDir)GatewayPlugins\%(RecursiveDir)" />
</Target>
<ItemGroup>
<ItemGroup>
<!--Modbus 插件-->
<PackageReference Include="ThingsGateway.Plugin.Modbus" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
@@ -102,7 +87,7 @@
<PkgThingsGateway_Plugin_VariableExpressionPackageFiles Include="$(PkgThingsGateway_Plugin_VariableExpression)\Content\$(CustomTargetFramework)\**\*.*" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
</PropertyGroup>
<RemoveDir Directories="$(PluginFolder)" />
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />

113
src/ThingsGateway.Server/targets/PluginContext.targets Normal file
View File

@@ -0,0 +1,113 @@
<Project>
<!--插件直接加载到程序上下文，不隔离-->
<ItemGroup>
<!--Modbus 插件-->
<PackageReference Include="ThingsGateway.Plugin.Modbus" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--SiemensS7 插件-->
<PackageReference Include="ThingsGateway.Plugin.SiemensS7" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--Dlt645 插件-->
<PackageReference Include="ThingsGateway.Plugin.Dlt645" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--OpcDa 插件-->
<PackageReference Include="ThingsGateway.Plugin.OpcDa" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--OpcDa 插件-->
<PackageReference Include="ThingsGateway.Plugin.OpcDaNetApi" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--OpcUa 插件-->
<PackageReference Include="ThingsGateway.Plugin.OpcUa" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--DB 插件-->
<PackageReference Include="ThingsGateway.Plugin.DB" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--Kafka 插件-->
<PackageReference Include="ThingsGateway.Plugin.Kafka" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--Mqtt 插件-->
<PackageReference Include="ThingsGateway.Plugin.Mqtt" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--RabbitMQ 插件-->
<PackageReference Include="ThingsGateway.Plugin.RabbitMQ" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
<!--VariableExpression 插件-->
<PackageReference Include="ThingsGateway.Plugin.VariableExpression" Version="$(PluginVersion)" GeneratePathProperty="true">
<Private>false</Private>
<IncludeAssets> native;</IncludeAssets>
</PackageReference>
</ItemGroup>
<Target Name="CopyPluginNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<PkgThingsGateway_Plugin_ModbusPackageFiles Include="$(PkgThingsGateway_Plugin_Modbus)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_SiemensS7PackageFiles Include="$(PkgThingsGateway_Plugin_SiemensS7)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_Dlt645PackageFiles Include="$(PkgThingsGateway_Plugin_Dlt645)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_DBPackageFiles Include="$(PkgThingsGateway_Plugin_DB)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_KafkaPackageFiles Include="$(PkgThingsGateway_Plugin_Kafka)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_MqttPackageFiles Include="$(PkgThingsGateway_Plugin_Mqtt)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_OpcDaPackageFiles Include="$(PkgThingsGateway_Plugin_OpcDa)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_OpcDaNetApiPackageFiles Include="$(PkgThingsGateway_Plugin_OpcDaNetApi)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_OpcUaPackageFiles Include="$(PkgThingsGateway_Plugin_OpcUa)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_RabbitMQPackageFiles Include="$(PkgThingsGateway_Plugin_RabbitMQ)\Content\$(CustomTargetFramework)\**\*.*" />
<PkgThingsGateway_Plugin_VariableExpressionPackageFiles Include="$(PkgThingsGateway_Plugin_VariableExpression)\Content\$(CustomTargetFramework)\**\*.*" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
<GatewayPluginFolder>$(TargetDir)GatewayPlugins\</GatewayPluginFolder>
</PropertyGroup>
<RemoveDir Directories="$(PluginFolder)" />
<RemoveDir Directories="$(GatewayPluginFolder)" />
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_SiemensS7PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_Dlt645PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DBPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_KafkaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaNetApiPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcUaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_RabbitMQPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_VariableExpressionPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
</Target>
</Project>

19
src/ThingsGateway.Server/targets/Publish1.targets Normal file
View File

@@ -0,0 +1,19 @@
<Project>
<Target Name="PostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<PluginsFiles Include="bin\$(Configuration)\$(TargetFramework)\Plugins\**" />
<GatewayPluginsFiles Include="bin\$(Configuration)\$(TargetFramework)\GatewayPlugins\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(PluginsFiles)" DestinationFolder="$(PublishDir)Plugins\%(RecursiveDir)" />
<Copy SourceFiles="@(GatewayPluginsFiles)" DestinationFolder="$(PublishDir)GatewayPlugins\%(RecursiveDir)" />
</Target>
</Project>

3
src/ThingsGateway.Winform/ThingsGateway.Winform.csproj
View File

@@ -2,7 +2,8 @@
<Import Project="$(SolutionDir)Version.props" />
<!--<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\PluginContext.targets" />
<!--<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\CustomPlugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\Custom.targets" />
<PropertyGroup>

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.3.8</Version>
<Version>7.2.3.9</Version>
</PropertyGroup>
<ItemGroup>