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

release：6.1.0.21

Browse Source 
feat: 关系库存储插件支持动态表格式脚本
refactor: 内存变量插件修改读取逻辑
This commit is contained in:
Diego
2024-09-06 02:06:08 +08:00
parent 606f538bf3
commit 5d7c0c635b
8 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/NugetPackageReference.props
View File

@@ -2,16 +2,16 @@
<!--PRO插件，需补充 LicenseKey 文件，也可以不依赖，单独放到Plugins文件夹内-->
<ItemGroup Condition="'$(SolutionName)'!='ThingsGateway - Admin'">
<PackageReference Include="ThingsGateway.Plugin.DCON" Version="6.1.0.20"/>
<!--<PackageReference Include="ThingsGateway.Plugin.DKQ_A16D" Version="6.1.0.20" />-->
<PackageReference Include="ThingsGateway.Plugin.EDPF_NT" Version="6.1.0.20" />
<!--<PackageReference Include="ThingsGateway.Plugin.IDR210" Version="6.1.0.20" />-->
<PackageReference Include="ThingsGateway.Plugin.KELID2008" Version="6.1.0.20" />
<PackageReference Include="ThingsGateway.Plugin.LKSIS" Version="6.1.0.20" />
<PackageReference Include="ThingsGateway.Plugin.Melsec" Version="6.1.0.20" />
<PackageReference Include="ThingsGateway.Plugin.Omron" Version="6.1.0.20" />
<!--<PackageReference Include="ThingsGateway.Plugin.URF_R330" Version="6.1.0.20" />-->
<PackageReference Include="ThingsGateway.Plugin.USBScaner" Version="6.1.0.20" />
<PackageReference Include="ThingsGateway.Plugin.DCON" Version="6.1.0.21"/>
<!--<PackageReference Include="ThingsGateway.Plugin.DKQ_A16D" Version="6.1.0.21" />-->
<PackageReference Include="ThingsGateway.Plugin.EDPF_NT" Version="6.1.0.21" />
<!--<PackageReference Include="ThingsGateway.Plugin.IDR210" Version="6.1.0.21" />-->
<PackageReference Include="ThingsGateway.Plugin.KELID2008" Version="6.1.0.21" />
<PackageReference Include="ThingsGateway.Plugin.LKSIS" Version="6.1.0.21" />
<PackageReference Include="ThingsGateway.Plugin.Melsec" Version="6.1.0.21" />
<PackageReference Include="ThingsGateway.Plugin.Omron" Version="6.1.0.21" />
<!--<PackageReference Include="ThingsGateway.Plugin.URF_R330" Version="6.1.0.21" />-->
<PackageReference Include="ThingsGateway.Plugin.USBScaner" Version="6.1.0.21" />
</ItemGroup>

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

@@ -2,10 +2,6 @@
<Import Project="$(SolutionDir)Version.props" />
<Import Project="$(SolutionDir)PackNuget.props" />
<PropertyGroup Condition="'$(SolutionName)'=='ThingsGateway - Admin'">
<DefineConstants>Admin</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\tools\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
<ProjectReference Include="$(SolutionDir)\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj" />

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

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="$(SolutionDir)NugetPackageReference.props"/>
<Import Project="$(SolutionDir)NugetPackageReference.props" />
<Import Project="$(SolutionDir)Version.props" />
<PropertyGroup>
@@ -35,6 +35,12 @@
<ProjectReference Include="$(SolutionDir)\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro'">
<ProjectReference Include="$(SolutionDir)\pro\ThingsGateway.Gateway.ProRazor\ThingsGateway.Gateway.ProRazor.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="DockerPush.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -52,10 +58,6 @@
</ItemGroup>
<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro'">
<ProjectReference Include="$(SolutionDir)\pro\ThingsGateway.Gateway.ProRazor\ThingsGateway.Gateway.ProRazor.csproj" />
</ItemGroup>

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>6.1.0.20</Version>
<Version>6.1.0.21</Version>
</PropertyGroup>
<ItemGroup>

2
src/adapter/ThingsGateway.Foundation.Demo/ThingsGateway.Foundation.Demo.csproj
View File

@@ -9,7 +9,7 @@
<ProjectReference Include="..\ThingsGateway.Foundation.Dlt645\ThingsGateway.Foundation.Dlt645.csproj" />
<ProjectReference Include="..\ThingsGateway.Foundation.Modbus\ThingsGateway.Foundation.Modbus.csproj" />
<ProjectReference Include="..\ThingsGateway.Foundation.SiemensS7\ThingsGateway.Foundation.SiemensS7.csproj" />
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.8.9" />
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.9.0" />
</ItemGroup>

2
src/adapter/ThingsGateway.Foundation.Variable/ThingsGateway.Foundation.Variable.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;</TargetFrameworks>
<Version>8.8.9</Version>
<Version>8.9.0</Version>
</PropertyGroup>
<ItemGroup>

8
src/docker-push.bat
View File

@@ -2,11 +2,11 @@ chcp 65001
rmdir /S /Q %~dp0\nupkgs
mkdir %~dp0\nupkgs
rem 构建解决方案
dotnet clean "ThingsGateway - ProNuget.sln" -c Release
dotnet build "ThingsGateway.sln" -c Release
dotnet build "ThingsGateway - ProNuget.sln" -c Release
dotnet build "ProNuget.sln" -c Release
dotnet restore
dotnet build "ThingsGateway - ProNuget.sln" -c Release
dotnet build "ThingsGateway.sln" -c Release
rem 切换到 ThingsGateway.Server 目录
cd .\ThingsGateway.Server

2
src/tools/ThingsGateway.CSScript/ThingsGateway.CSScript.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;</TargetFrameworks>
<Version>8.8.9</Version>
<Version>8.9.0</Version>
</PropertyGroup>
<ItemGroup>