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

10.10.23

Browse Source
This commit is contained in:
Diego
2025-08-18 17:03:40 +08:00
parent ff7d029e6f
commit 6da142d080
39 changed files with 3220 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/ThingsGateway.AdminServer/Admin.targets
View File

@@ -29,7 +29,7 @@
<Target Name="AdminPostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<AdminFiles Include="bin\$(Configuration)\$(TargetFramework)\SeedData\**" />
<AdminFiles Include="$(OutputPath)\$(TargetFramework)\SeedData\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>

4
src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
View File

@@ -30,11 +30,11 @@
<PackageReference Include="MySqlConnector" Version="2.4.0" />
<PackageReference Include="Npgsql" Version="9.0.3" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="TDengine.Connector" Version="3.1.7" />
<PackageReference Include="TDengine.Connector" Version="3.1.8" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.23" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />

10
src/Directory.Build.props
View File

@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<PluginVersion>10.10.20</PluginVersion>
<ProPluginVersion>10.10.20</ProPluginVersion>
<DefaultVersion>10.10.20</DefaultVersion>
<AuthenticationVersion>10.10.1</AuthenticationVersion>
<SourceGeneratorVersion>10.10.1</SourceGeneratorVersion>
<PluginVersion>10.10.23</PluginVersion>
<ProPluginVersion>10.10.23</ProPluginVersion>
<DefaultVersion>10.10.23</DefaultVersion>
<AuthenticationVersion>10.10.2</AuthenticationVersion>
<SourceGeneratorVersion>10.10.2</SourceGeneratorVersion>
<NET8Version>8.0.19</NET8Version>
<NET9Version>9.0.8</NET9Version>
<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>

3088
src/Drivers/ThingsGateway.AllenBradley.deps.json Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
src/Drivers/ThingsGateway.AllenBradley.dll Normal file
View File

Binary file not shown.

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

@@ -12,7 +12,7 @@
<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.3" />
<ProjectReference Include="..\..\Admin\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj" />
</ItemGroup>

2
src/Plugin/ThingsGateway.Foundation.OpcUa/OpcUaMaster/OpcUaMaster.cs
View File

@@ -423,12 +423,14 @@ public class OpcUaMaster : IDisposable, IAsyncDisposable
Disconnect();
_variableDicts?.Clear();
_subscriptionDicts?.Clear();
waitLock?.Dispose();
}
public async ValueTask DisposeAsync()
{
await DisconnectAsync().ConfigureAwait(false);
_variableDicts?.Clear();
_subscriptionDicts?.Clear();
waitLock?.Dispose();
}
/// <summary>
/// 获取变量说明

2
src/Plugin/ThingsGateway.Foundation.OpcUa/Utils/JsonEncoder.cs
View File

@@ -1932,7 +1932,7 @@
// }
// private void WriteDiagnosticInfo(string fieldName, DiagnosticInfo value, int depth)
// {
// if (value == null || value.IsNullDiagnosticInfo)
// if (value?.IsNullDiagnosticInfo != false)
// {
// WriteSimpleField(fieldName, null, quotes: false);
// return;

2
src/Plugin/ThingsGateway.Foundation.Test/ThingsGateway.Foundation.Test.csproj
View File

@@ -13,7 +13,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

8
src/Plugin/ThingsGateway.Plugin.DB/Directory.build.targets
View File

@@ -27,19 +27,19 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Plugin.DB*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Plugin.DB*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*TDengine*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*TDengine*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*QuestDb*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*QuestDb*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*CsvHelper*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*CsvHelper*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

6
src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj
View File

@@ -3,8 +3,10 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>

13
src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DBPro.csproj
View File

@@ -1,16 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\Version.props" />
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>ThingsGateway.Plugin.DB</AssemblyName>
@@ -22,7 +27,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />

2
src/Plugin/ThingsGateway.Plugin.Dlt645/Directory.build.targets
View File

@@ -5,7 +5,7 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Dlt645*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Dlt645*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">

10
src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645Pro.csproj
View File

@@ -6,8 +6,10 @@
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -21,7 +23,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\ThingsGateway.Foundation.Dlt645\ThingsGateway.Foundation.Dlt645.csproj">
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>

2
src/Plugin/ThingsGateway.Plugin.Http/Directory.build.targets
View File

@@ -5,7 +5,7 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Http*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Http*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.Http.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">

10
src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.HttpPro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -17,7 +19,9 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
</ItemGroup>

2
src/Plugin/ThingsGateway.Plugin.Kafka/Directory.build.targets
View File

@@ -17,7 +17,7 @@
<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Kafka*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Kafka*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.Kafka.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">

10
src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.KafkaPro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -17,7 +19,9 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<PackageReference Include="Confluent.Kafka" Version="2.11.0" GeneratePathProperty="true">
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>

2
src/Plugin/ThingsGateway.Plugin.Modbus/Directory.build.targets
View File

@@ -5,7 +5,7 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Modbus*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Modbus*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">

10
src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.ModbusPro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -19,7 +21,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\ThingsGateway.Foundation.Modbus\ThingsGateway.Foundation.Modbus.csproj">
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>

2
src/Plugin/ThingsGateway.Plugin.Mqtt/Directory.build.targets
View File

@@ -26,7 +26,7 @@
<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*MQTT*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*MQTT*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.Mqtt.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">

10
src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.MqttPro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -19,7 +21,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>

2
src/Plugin/ThingsGateway.Plugin.OpcDa/Directory.build.targets
View File

@@ -5,7 +5,7 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Opc*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Opc*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDa.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>Plugin</DefineConstants>

10
src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDaPro.csproj
View File

@@ -6,8 +6,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Plugin;Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -38,7 +40,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\ThingsGateway.Foundation.OpcDa\ThingsGateway.Foundation.OpcDa.csproj">
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>

2
src/Plugin/ThingsGateway.Plugin.OpcUa/Directory.build.targets
View File

@@ -32,7 +32,7 @@
<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Opc*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Opc*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUa.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>Plugin</DefineConstants>

10
src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUaPro.csproj
View File

@@ -6,8 +6,10 @@
<DefineConstants>$(DefineConstants);Plugin;Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -40,7 +42,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\ThingsGateway.Foundation.OpcUa\ThingsGateway.Foundation.OpcUa.csproj" />

6
src/Plugin/ThingsGateway.Plugin.RabbitMQ/Directory.build.targets
View File

@@ -20,15 +20,15 @@
<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*RabbitMQ*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*RabbitMQ*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Pipelines*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Pipelines*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*RateLimiting*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*RateLimiting*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQ.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">

10
src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQPro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -17,7 +19,9 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
</ItemGroup>

2
src/Plugin/ThingsGateway.Plugin.SiemensS7/Directory.build.targets
View File

@@ -5,7 +5,7 @@
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
<ItemGroup>
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Siemens*.dll">
<Content Include="$(ProjectDir)$(OutputPath)\$(TargetFramework)\**\*Siemens*.dll">
<Pack>true</Pack>
<PackagePath>Content</PackagePath>
</Content>

4
src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7.csproj
View File

@@ -3,7 +3,9 @@
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">

10
src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7Pro.csproj
View File

@@ -5,8 +5,10 @@
<TargetFrameworks>net8.0;</TargetFrameworks>
<DefineConstants>$(DefineConstants);Management</DefineConstants>
<OutputPath>bin\$(Configuration)\Management\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
<OutputPath>bin\$(Configuration)\Management</OutputPath>
<IntermediateOutputPath>obj\Management\$(Configuration)\</IntermediateOutputPath>
<!--<BaseIntermediateOutputPath>obj\Management\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>-->
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\..\nupkgs1</PackageOutputPath>
</PropertyGroup>
@@ -18,7 +20,9 @@
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
</ProjectReference>
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" />
<ProjectReference Include="..\..\PluginPro\ThingsGateway.Management.Razor\ThingsGateway.Management.Razor.csproj" >
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\ThingsGateway.Foundation.SiemensS7\ThingsGateway.Foundation.SiemensS7.csproj">
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>