修改编译项

src/Admin/ThingsGateway.Admin.Razor/Pages/Resource/SysResourcePage.razor

@@ -26,12 +26,12 @@
                 OnQueryAsync="OnQueryAsync" CustomerSearchModel="@CustomerSearchModel"
                 OnSaveAsync="Save" OnDeleteAsync="Delete">
         <TableToolbarTemplate>
-            <PopConfirmButton Color=Color.Warning IsDisabled="SelectedRows.Count<=0||!AuthorizeButton(AdminOperConst.Add)" Text=@OperDescLocalizer["CopyResource"] Icon="fa fa-copy" OnConfirm="OnCopy">
+            <PopConfirmButton Color=Color.Warning IsKeepDisabled="SelectedRows.Count <= 0 || !AuthorizeButton(AdminOperConst.Add)" Text=@OperDescLocalizer["CopyResource"] Icon="fa fa-copy" OnConfirm="OnCopy">
                 <BodyTemplate>
                     <Select Items="ModuleSelectedItems" @bind-Value=CopyModule ShowLabel="false" />
                 </BodyTemplate>
             </PopConfirmButton>
-            <PopConfirmButton Color=Color.Warning IsDisabled="SelectedRows.Count!=1||!AuthorizeButton(AdminOperConst.Edit)" Text=@OperDescLocalizer["ChangeParentResource"] Icon="fa fa-copy" OnConfirm="OnChangeParent">
+            <PopConfirmButton Color=Color.Warning IsKeepDisabled="SelectedRows.Count != 1 || !AuthorizeButton(AdminOperConst.Edit)" Text=@OperDescLocalizer["ChangeParentResource"] Icon="fa fa-copy" OnConfirm="OnChangeParent">
                 <BodyTemplate>
                     <div class="overflow-y-auto" style="height:500px">
                         <TreeView Items="MenuTreeItems" IsVirtualize="true" OnTreeItemClick="a=>{ChangeParentId=a.Value.Id;return Task.CompletedTask;}" />

src/Admin/ThingsGateway.AdminServer/Admin.targets

@@ -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>

src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj

@@ -14,7 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-		<PackageReference Include="BootstrapBlazor" Version="9.9.1" />
+		<PackageReference Include="BootstrapBlazor" Version="9.9.2" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Admin/ThingsGateway.Razor/Components/ImportExcelConfirm.razor

@@ -41,7 +41,7 @@
 
             }
 
-            <PopConfirmButton IsAsync IsDisabled=@_importPreviews.Any(it => it.Value.HasError) Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
+            <PopConfirmButton IsAsync IsKeepDisabled=@_importPreviews.Any(it => it.Value.HasError) Color=Color.Warning class="mt-2" OnConfirm=@(SaveDeviceImport)>@Localizer["Import"]</PopConfirmButton>
 
 @* 
             <Button IsAsync class="mt-2" IsDisabled=@_importPreviews.Any(it => it.Value.HasError) OnClick="() => step.Next()">@Localizer["Next"]</Button> *@

src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj

@@ -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.22" />
+		<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" />

src/Directory.Build.props

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

src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.cs

@@ -177,7 +177,7 @@ public partial class VariableRuntime : Variable
     /// 是否在线
     /// </summary>
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 5)]
-    public bool IsOnline{get;set;}
+    public bool IsOnline { get; set; }
 
     /// <summary>
     /// 设备名称

src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs

@@ -392,16 +392,17 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
         ManageHelper.CheckChannelCount(insertData.Count);
 
         using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > 2 * 1024 * 1024)
+        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
-        {
-            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
-            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
-        }
-        else
         {
             await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
             await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
         }
+        else
+        {
+            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
+            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
+
+        }
         DeleteChannelFromCache();
         return upData.Select(a => a.Id).Concat(insertData.Select(a => a.Id)).ToHashSet();
     }

src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs

@@ -388,16 +388,17 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
         ManageHelper.CheckDeviceCount(insertData.Count);
 
         using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > 2 * 1024 * 1024)
+        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
-        {
-            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
-            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
-        }
-        else
         {
             await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
             await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
         }
+        else
+        {
+
+            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
+            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
+        }
         DeleteDeviceFromCache();
         return upData.Select(a => a.Id).Concat(insertData.Select(a => a.Id)).ToHashSet();
     }

src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Redundant/RedundancyTask.cs

@@ -63,7 +63,7 @@ internal sealed class RedundancyTask : IRpcDriver, IAsyncDisposable
         const int highMemorySize = 100000;
         const long memoryThreshold = 2L * 1024 * 1024; // 2GB，单位KB
 
-        return GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > memoryThreshold
+        return (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > memoryThreshold && WebEnableVariable.WebEnable == true)
             ? highMemorySize
             : defaultSize;
     }

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs

@@ -209,18 +209,19 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         var result = await db.UseTranAsync(async () =>
         {
-            if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > 2 * 1024 * 1024)
+            if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
-            {
-                await db.BulkCopyAsync(newChannels, 200000).ConfigureAwait(false);
-                await db.BulkCopyAsync(newDevices, 200000).ConfigureAwait(false);
-                await db.BulkCopyAsync(newVariables, 200000).ConfigureAwait(false);
-            }
-            else
             {
                 await db.BulkCopyAsync(newChannels, 10000).ConfigureAwait(false);
                 await db.BulkCopyAsync(newDevices, 10000).ConfigureAwait(false);
                 await db.BulkCopyAsync(newVariables, 10000).ConfigureAwait(false);
             }
+            else
+            {
+                await db.BulkCopyAsync(newChannels, 200000).ConfigureAwait(false);
+                await db.BulkCopyAsync(newDevices, 200000).ConfigureAwait(false);
+                await db.BulkCopyAsync(newVariables, 200000).ConfigureAwait(false);
+
+            }
         }).ConfigureAwait(false);
         if (result.IsSuccess)//如果成功了
         {
@@ -492,7 +493,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
     [OperDesc("ExportVariable", isRecordPar: false, localizerType: typeof(Variable))]
     public async Task<Dictionary<string, object>> ExportVariableAsync(GatewayExportFilter exportFilter)
     {
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 4 * 1024 * 1024)
+        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 4 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
         {
             var whereQuery = await GetWhereEnumerableFunc(exportFilter).ConfigureAwait(false);
             //导出
@@ -566,15 +567,16 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
     {
         ManageHelper.CheckVariableCount(insertData.Count);
         using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > 2 * 1024 * 1024)
+        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
-        {
-            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
-            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
-        }
-        else
         {
             await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
             await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
+
+        }
+        else
+        {
+            await db.BulkCopyAsync(insertData, 200000).ConfigureAwait(false);
+            await db.BulkUpdateAsync(upData, 200000).ConfigureAwait(false);
         }
         DeleteVariableCache();
         return upData.Select(a => a.Id).Concat(insertData.Select(a => a.Id)).ToHashSet();

src/Gateway/ThingsGateway.Gateway.Razor/Components/QuickActions.razor

@@ -26,7 +26,7 @@
                           Content=@(ReloadServiceConfirmText)
                           Icon="fas fa-rotate"
                           IsAsync="true"
-                          OnConfirm="Restart" IsDisabled=@(!AuthorizeButton("重启")) />
+                          OnConfirm="Restart" IsKeepDisabled=@(!AuthorizeButton("重启")) />
 
 
     </div>

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor

@@ -71,7 +71,7 @@
     </TableColumns>
     <RowButtonTemplate>
 
-        <PopConfirmButton IsDisabled=@(!AuthorizeButton("写入变量")) Size="Size.ExtraSmall" Color="Color.Warning" Icon="fa-solid fa-bars" Text="@Localizer["WriteVariable"]" IsAsync OnConfirm="() => OnWriteVariable(context)">
+        <PopConfirmButton IsKeepDisabled=@(!AuthorizeButton("写入变量")) Size="Size.ExtraSmall" Color="Color.Warning" Icon="fa-solid fa-bars" Text="@Localizer["WriteVariable"]" IsAsync OnConfirm="() => OnWriteVariable(context)">
 
             <BodyTemplate>
                 <Textarea @bind-Value=WriteValue ShowLabel="true" ShowLabelTooltip="true" />
@@ -125,7 +125,7 @@
 
         @if (WebsiteOption.Value.Demo || App.HostEnvironment.IsDevelopment())
         {
-            <PopConfirmButton Color=Color.Warning Text="@Localizer["Test"]" IsDisabled=@(!AuthorizeButton(AdminOperConst.Add))
+            <PopConfirmButton Color=Color.Warning Text="@Localizer["Test"]" IsKeepDisabled=@(!AuthorizeButton(AdminOperConst.Add))
                               IsAsync OnConfirm=@(InsertTestDataAsync)>
 
                 <BodyTemplate>

src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj

@@ -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>

src/Plugin/ThingsGateway.Foundation.OpcUa/OpcUaMaster/OpcUaMaster.cs

@@ -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>
     /// 获取变量说明

src/Plugin/ThingsGateway.Foundation.OpcUa/Utils/JsonEncoder.cs

@@ -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;

src/Plugin/ThingsGateway.Foundation.Test/ThingsGateway.Foundation.Test.csproj

@@ -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>

src/Plugin/ThingsGateway.Plugin.DB/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj

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

src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DBPro.csproj

@@ -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>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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" />
 

src/Plugin/ThingsGateway.Plugin.Dlt645/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645Pro.csproj

@@ -6,8 +6,10 @@
 
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/Plugin/ThingsGateway.Plugin.Http/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.Http.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.HttpPro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>
 
 

src/Plugin/ThingsGateway.Plugin.Kafka/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.Kafka.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.KafkaPro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/Plugin/ThingsGateway.Plugin.Modbus/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.ModbusPro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/Plugin/ThingsGateway.Plugin.Mqtt/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.Mqtt.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.MqttPro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>
 
 
 

src/Plugin/ThingsGateway.Plugin.OpcDa/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDa.csproj

@@ -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>

src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDaPro.csproj

@@ -6,8 +6,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Plugin;Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/Plugin/ThingsGateway.Plugin.OpcUa/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUa.csproj

@@ -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>

src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUaPro.csproj

@@ -6,8 +6,10 @@
 
 
 		<DefineConstants>$(DefineConstants);Plugin;Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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" />
 

src/Plugin/ThingsGateway.Plugin.RabbitMQ/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQ.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQPro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/Plugin/ThingsGateway.Plugin.SiemensS7/Directory.build.targets

@@ -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>

src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7.csproj

@@ -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">

src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7Pro.csproj

@@ -5,8 +5,10 @@
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 
 		<DefineConstants>$(DefineConstants);Management</DefineConstants>
-		<OutputPath>bin\$(Configuration)\Management\</OutputPath>
+		<OutputPath>bin\$(Configuration)\Management</OutputPath>
-		<IntermediateOutputPath>obj\$(Configuration)\Management\$(TargetFramework)\</IntermediateOutputPath>
+		<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>

src/ThingsGateway.Server/ThingsGateway.Server.csproj

@@ -34,7 +34,7 @@
 	
 	<!--<Import Project="targets\Pro3.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' " />
 	<Import Project="targets\Pro5.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' " />-->
-	<Import Project="targets\Pro6.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' AND '$(Configuration)' != 'Debug'" />
+	<!--<Import Project="targets\Pro6.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' AND '$(Configuration)' != 'Debug'" />-->
 
 	<!--打包复制-->
 	<Import Project="targets\PluginPublish.targets" />
@@ -134,6 +134,9 @@
 		<None Update="thingsgateway.service">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="WindowsWebDisable.bat">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="WindowsServiceCreate.bat">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>

src/ThingsGateway.Server/WindowsWebDisable.bat

@@ -0,0 +1 @@
+set WebEnable=false && ThingsGateway.Server.exe

src/ThingsGateway.Server/targets/Pro2.targets

@@ -24,11 +24,11 @@
 		<!--Omron 插件-->
 		<PackageReference Include="ThingsGateway.Plugin.Omron" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />
 		<!--DKQ_A16D 插件-->
-		<PackageReference Include="ThingsGateway.Plugin.DKQ_A16D" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />
+		<!--<PackageReference Include="ThingsGateway.Plugin.DKQ_A16D" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />-->
 		<!--IDR210 插件-->
-		<PackageReference Include="ThingsGateway.Plugin.IDR210" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />
+		<!--<PackageReference Include="ThingsGateway.Plugin.IDR210" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />-->
 		<!--URF_R330 插件-->
-		<PackageReference Include="ThingsGateway.Plugin.URF_R330" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />
+		<!--<PackageReference Include="ThingsGateway.Plugin.URF_R330" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />-->
 		<!--USBScaner 插件-->
 		<PackageReference Include="ThingsGateway.Plugin.USBScaner" Version="$(ProPluginVersion)" GeneratePathProperty="true" Private="false"  IncludeAssets=" native;" />
 

src/ThingsGateway.Server/targets/ProPluginDebug.targets

@@ -6,11 +6,11 @@
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.AllenBradleyCip\ThingsGateway.Plugin.AllenBradleyCip.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.BACnet\ThingsGateway.Plugin.BACnet.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.DCON\ThingsGateway.Plugin.DCON.csproj" />
-		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.DKQ_A16D\ThingsGateway.Plugin.DKQ_A16D.csproj" />
+		<!--<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.DKQ_A16D\ThingsGateway.Plugin.DKQ_A16D.csproj" />-->
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.EDPF_NT\ThingsGateway.Plugin.EDPF_NT.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.HJ212\ThingsGateway.Plugin.HJ212.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.HUANANSFSK\ThingsGateway.Plugin.HUANANSFSK.csproj" />
-		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.IDR210\ThingsGateway.Plugin.IDR210.csproj" />
+		<!--<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.IDR210\ThingsGateway.Plugin.IDR210.csproj" />-->
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.KELID2008\ThingsGateway.Plugin.KELID2008.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.LEIDIAN\ThingsGateway.Plugin.LEIDIANAPI.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.LKSIS\ThingsGateway.Plugin.LKSIS.csproj" />
@@ -21,7 +21,7 @@
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.Omron\ThingsGateway.Plugin.Omron.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.SECS\ThingsGateway.Plugin.SECS.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.TS550\ThingsGateway.Plugin.TS550.csproj" />
-		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.URF_R330\ThingsGateway.Plugin.URF_R330.csproj" />
+		<!--<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.URF_R330\ThingsGateway.Plugin.URF_R330.csproj" />-->
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.USBScaner\ThingsGateway.Plugin.USBScaner.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.Vigor\ThingsGateway.Plugin.Vigor.csproj" />
 		<ProjectReference Include="..\PluginPro\ThingsGateway.Plugin.YPSFSK\ThingsGateway.Plugin.YPSFSK.csproj" />