diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 275069f..1f19179 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -14,12 +14,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 6.x + 7.x 8.x + 9.x - name: Get Version run: echo "VERSION=$(date '+%Y.%m%d-beta%H%M')" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a9ab08..a1484d0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,12 +12,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 6.x + 7.x 8.x + 9.x - name: Get Version run: echo "VERSION=$(date '+%Y.%m%d')" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b037461..3408a9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,12 +14,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 6.x + 7.x 8.x + 9.x - name: Build run: | dotnet build -c Release diff --git a/NewLife.Templates/README.md b/NewLife.Templates/README.md index d2064e3..b1493e7 100644 --- a/NewLife.Templates/README.md +++ b/NewLife.Templates/README.md @@ -1,10 +1,10 @@ -# ģ +# 新生命模版包 -վhttps://newlifex.com +网站：https://newlifex.com -QQȺdotNET 1600800 / Ƕʽ 1600838 +QQ群：dotNET 1600800 / 嵌入式 1600838 -ŶӣNewLife2002꣬ʱҵṩߣṩӲӦ÷ѯϵͳܹ滮뿪 +新生命团队（NewLife）成立于2002年，是新时代物联网行业解决方案提供者，致力于提供软硬件应用方案咨询、系统架构规划与开发服务。 -ŶĿԴ NewLife ϵѱ㷺ӦڸҵɹӦڵУšͨءҽơIJҵΪͻṩ˴ȽɿȫչIJƷϵͳɷNugetۼߴ300Ρ㣬ֱĿʮĿ漰棬ݼʮˡ \ No newline at end of file +团队主导的开源 NewLife 系列组件已被广泛应用于各行业，成功的应用于电力、高校、互联网、电信、交通、物流、工控、医疗、文博等行业，为客户提供了大量先进、可靠、安全、高质量、易扩展的产品和系统集成服务。Nuget累计下载量高达300余万次。初步估算，直接受益的软件项目数十万个，项目涉及生活方方面面，惠及数十亿人。 \ No newline at end of file diff --git a/Zero.Agent/Zero.Agent.csproj b/Zero.Agent/Zero.Agent.csproj index ef9e25f..3d62763 100644 --- a/Zero.Agent/Zero.Agent.csproj +++ b/Zero.Agent/Zero.Agent.csproj @@ -23,10 +23,10 @@ - - - - + + + + diff --git a/Zero.Agent2/Zero.Agent2.csproj b/Zero.Agent2/Zero.Agent2.csproj index 6f797b0..8d54305 100644 --- a/Zero.Agent2/Zero.Agent2.csproj +++ b/Zero.Agent2/Zero.Agent2.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/Zero.AntJob/Zero.AntJob.csproj b/Zero.AntJob/Zero.AntJob.csproj index 065c757..48b83d0 100644 --- a/Zero.AntJob/Zero.AntJob.csproj +++ b/Zero.AntJob/Zero.AntJob.csproj @@ -30,9 +30,9 @@ - - - + + + diff --git a/Zero.Client/Zero.Client.csproj b/Zero.Client/Zero.Client.csproj index 0263e9d..1329d43 100644 --- a/Zero.Client/Zero.Client.csproj +++ b/Zero.Client/Zero.Client.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/Zero.Console/Workers/MqttWorker.cs b/Zero.Console/Workers/MqttWorker.cs index 6edeec9..dcb6092 100644 --- a/Zero.Console/Workers/MqttWorker.cs +++ b/Zero.Console/Workers/MqttWorker.cs @@ -1,4 +1,5 @@ -using NewLife.MQTT; +using NewLife.Data; +using NewLife.MQTT; using NewLife.MQTT.Messaging; namespace Zero.Console.Workers; diff --git a/Zero.Console/Zero.Console.csproj b/Zero.Console/Zero.Console.csproj index d979087..08d4186 100644 --- a/Zero.Console/Zero.Console.csproj +++ b/Zero.Console/Zero.Console.csproj @@ -25,10 +25,10 @@ - - - - + + + + diff --git a/Zero.Core/Zero.Core.csproj b/Zero.Core/Zero.Core.csproj index 5746248..42c3e44 100644 --- a/Zero.Core/Zero.Core.csproj +++ b/Zero.Core/Zero.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + netstandard2.0 Zero 零代核心库 Web应用、微服务、应用服务、大数据计算和客户端等多个端共用的类库，例如模型类等。原则上要求最少依赖第三方 @@ -18,8 +18,8 @@ - - + + diff --git a/Zero.Data/Interfaces/IMember.cs b/Zero.Data/Interfaces/IMember.cs deleted file mode 100644 index 4c29922..0000000 --- a/Zero.Data/Interfaces/IMember.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 成员。所有可用团队成员 - public partial interface IMember - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 名称 - String Name { get; set; } - - /// 类型 - String Kind { get; set; } - - /// 团队。所属主团队 - Int32 TeamId { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 团队数。所在团队总数，含协助团队 - Int32 Teams { get; set; } - - /// 用户。所属登录用户 - Int32 UserId { get; set; } - - /// 用户名 - String UserName { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Interfaces/IProduct.cs b/Zero.Data/Interfaces/IProduct.cs deleted file mode 100644 index 22b0da7..0000000 --- a/Zero.Data/Interfaces/IProduct.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 产品 - public partial interface IProduct - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 团队 - Int32 TeamId { get; set; } - - /// 名称 - String Name { get; set; } - - /// 类型 - String Kind { get; set; } - - /// 负责人 - Int32 LeaderId { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 版本数 - Int32 Versions { get; set; } - - /// 故事数 - Int32 Stories { get; set; } - - /// 完成 - Boolean Completed { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Interfaces/IStory.cs b/Zero.Data/Interfaces/IStory.cs deleted file mode 100644 index b611563..0000000 --- a/Zero.Data/Interfaces/IStory.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 故事。用户故事的目标是将特定价值提供给客户，不必是传统意义上的外部最终用户，也可以是依赖您团队的组织内部客户或同事。用户故事是简单语言中的几句话，概述了所需的结果。 - public partial interface IStory - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 产品 - Int32 ProductId { get; set; } - - /// 版本 - Int32 VersionId { get; set; } - - /// 处理人 - Int32 MemberId { get; set; } - - /// 事项 - String Title { get; set; } - - /// 开始日期 - DateTime StartDate { get; set; } - - /// 结束日期 - DateTime EndDate { get; set; } - - /// 工时 - Int32 ManHours { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Interfaces/ITeam.cs b/Zero.Data/Interfaces/ITeam.cs deleted file mode 100644 index 7dfe280..0000000 --- a/Zero.Data/Interfaces/ITeam.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 团队。管理一系列相关的产品和应用系统 - public partial interface ITeam - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 名称 - String Name { get; set; } - - /// 编码 - String Code { get; set; } - - /// 组长 - Int32 LeaderId { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 产品数 - Int32 Products { get; set; } - - /// 版本数 - Int32 Versions { get; set; } - - /// 成员数。主要成员 - Int32 Members { get; set; } - - /// 协助成员数。其它团队临时协助该团队的成员 - Int32 AssistMembers { get; set; } - - /// 机器人 - String WebHook { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Interfaces/ITeamMember.cs b/Zero.Data/Interfaces/ITeamMember.cs deleted file mode 100644 index 8e4a5f9..0000000 --- a/Zero.Data/Interfaces/ITeamMember.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 团队成员。每个团队拥有哪些成员，每个成员有一个主力团队 - public partial interface ITeamMember - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 团队 - Int32 TeamId { get; set; } - - /// 成员 - Int32 MemberId { get; set; } - - /// 类型 - String Kind { get; set; } - - /// 主要。是否该成员的主要团队 - Boolean Major { get; set; } - - /// 组长。该团队组长 - Boolean Leader { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Interfaces/IVersionPlan.cs b/Zero.Data/Interfaces/IVersionPlan.cs deleted file mode 100644 index 3642e1c..0000000 --- a/Zero.Data/Interfaces/IVersionPlan.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 版本计划 - public partial interface IVersionPlan - { - #region 属性 - /// 编号 - Int32 ID { get; set; } - - /// 团队 - Int32 TeamId { get; set; } - - /// 产品 - Int32 ProductId { get; set; } - - /// 名称。版本号 - String Name { get; set; } - - /// 类型 - String Kind { get; set; } - - /// 开始日期 - DateTime StartDate { get; set; } - - /// 结束日期 - DateTime EndDate { get; set; } - - /// 工时 - Int32 ManHours { get; set; } - - /// 启用 - Boolean Enable { get; set; } - - /// 完成 - Boolean Completed { get; set; } - - /// 故事数 - Int32 Stories { get; set; } - - /// 备注 - String Remark { get; set; } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/MemberDto.cs b/Zero.Data/Models/MemberDto.cs deleted file mode 100644 index 30a3862..0000000 --- a/Zero.Data/Models/MemberDto.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 成员。所有可用团队成员 - public partial class MemberDto : IMember - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 名称 - public String Name { get; set; } - - /// 类型 - public String Kind { get; set; } - - /// 团队。所属主团队 - public Int32 TeamId { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 团队数。所在团队总数，含协助团队 - public Int32 Teams { get; set; } - - /// 用户。所属登录用户 - public Int32 UserId { get; set; } - - /// 用户名 - public String UserName { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(IMember model) - { - ID = model.ID; - Name = model.Name; - Kind = model.Kind; - TeamId = model.TeamId; - Enable = model.Enable; - Teams = model.Teams; - UserId = model.UserId; - UserName = model.UserName; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/ProductModel.cs b/Zero.Data/Models/ProductModel.cs deleted file mode 100644 index 928efe6..0000000 --- a/Zero.Data/Models/ProductModel.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 产品 - public partial class ProductModel : IProduct - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 团队 - public Int32 TeamId { get; set; } - - /// 名称 - public String Name { get; set; } - - /// 类型 - public String Kind { get; set; } - - /// 负责人 - public Int32 LeaderId { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 版本数 - public Int32 Versions { get; set; } - - /// 故事数 - public Int32 Stories { get; set; } - - /// 完成 - public Boolean Completed { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(IProduct model) - { - ID = model.ID; - TeamId = model.TeamId; - Name = model.Name; - Kind = model.Kind; - LeaderId = model.LeaderId; - Enable = model.Enable; - Versions = model.Versions; - Stories = model.Stories; - Completed = model.Completed; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/StoryModel.cs b/Zero.Data/Models/StoryModel.cs deleted file mode 100644 index 631f36a..0000000 --- a/Zero.Data/Models/StoryModel.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 故事。用户故事的目标是将特定价值提供给客户，不必是传统意义上的外部最终用户，也可以是依赖您团队的组织内部客户或同事。用户故事是简单语言中的几句话，概述了所需的结果。 - public partial class StoryModel : IStory - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 产品 - public Int32 ProductId { get; set; } - - /// 版本 - public Int32 VersionId { get; set; } - - /// 处理人 - public Int32 MemberId { get; set; } - - /// 事项 - public String Title { get; set; } - - /// 开始日期 - public DateTime StartDate { get; set; } - - /// 结束日期 - public DateTime EndDate { get; set; } - - /// 工时 - public Int32 ManHours { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(IStory model) - { - ID = model.ID; - ProductId = model.ProductId; - VersionId = model.VersionId; - MemberId = model.MemberId; - Title = model.Title; - StartDate = model.StartDate; - EndDate = model.EndDate; - ManHours = model.ManHours; - Enable = model.Enable; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/TeamMemberModel.cs b/Zero.Data/Models/TeamMemberModel.cs deleted file mode 100644 index cc84f39..0000000 --- a/Zero.Data/Models/TeamMemberModel.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 团队成员。每个团队拥有哪些成员，每个成员有一个主力团队 - public partial class TeamMemberModel : ITeamMember - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 团队 - public Int32 TeamId { get; set; } - - /// 成员 - public Int32 MemberId { get; set; } - - /// 类型 - public String Kind { get; set; } - - /// 主要。是否该成员的主要团队 - public Boolean Major { get; set; } - - /// 组长。该团队组长 - public Boolean Leader { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(ITeamMember model) - { - ID = model.ID; - TeamId = model.TeamId; - MemberId = model.MemberId; - Kind = model.Kind; - Major = model.Major; - Leader = model.Leader; - Enable = model.Enable; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/TeamModel.cs b/Zero.Data/Models/TeamModel.cs deleted file mode 100644 index b0852c6..0000000 --- a/Zero.Data/Models/TeamModel.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 团队。管理一系列相关的产品和应用系统 - public partial class TeamModel : ITeam - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 名称 - public String Name { get; set; } - - /// 编码 - public String Code { get; set; } - - /// 组长 - public Int32 LeaderId { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 产品数 - public Int32 Products { get; set; } - - /// 版本数 - public Int32 Versions { get; set; } - - /// 成员数。主要成员 - public Int32 Members { get; set; } - - /// 协助成员数。其它团队临时协助该团队的成员 - public Int32 AssistMembers { get; set; } - - /// 机器人 - public String WebHook { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(ITeam model) - { - ID = model.ID; - Name = model.Name; - Code = model.Code; - LeaderId = model.LeaderId; - Enable = model.Enable; - Products = model.Products; - Versions = model.Versions; - Members = model.Members; - AssistMembers = model.AssistMembers; - WebHook = model.WebHook; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Models/VersionPlanModel.cs b/Zero.Data/Models/VersionPlanModel.cs deleted file mode 100644 index 78aac7b..0000000 --- a/Zero.Data/Models/VersionPlanModel.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.Serialization; -using System.Web.Script.Serialization; -using System.Xml.Serialization; - -namespace Zero.Data.Projects -{ - /// 版本计划 - public partial class VersionPlanModel : IVersionPlan - { - #region 属性 - /// 编号 - public Int32 ID { get; set; } - - /// 团队 - public Int32 TeamId { get; set; } - - /// 产品 - public Int32 ProductId { get; set; } - - /// 名称。版本号 - public String Name { get; set; } - - /// 类型 - public String Kind { get; set; } - - /// 开始日期 - public DateTime StartDate { get; set; } - - /// 结束日期 - public DateTime EndDate { get; set; } - - /// 工时 - public Int32 ManHours { get; set; } - - /// 启用 - public Boolean Enable { get; set; } - - /// 完成 - public Boolean Completed { get; set; } - - /// 故事数 - public Int32 Stories { get; set; } - - /// 备注 - public String Remark { get; set; } - #endregion - - #region 拷贝 - /// 拷贝模型对象 - /// 模型 - public void Copy(IVersionPlan model) - { - ID = model.ID; - TeamId = model.TeamId; - ProductId = model.ProductId; - Name = model.Name; - Kind = model.Kind; - StartDate = model.StartDate; - EndDate = model.EndDate; - ManHours = model.ManHours; - Enable = model.Enable; - Completed = model.Completed; - Stories = model.Stories; - Remark = model.Remark; - } - #endregion - } -} \ No newline at end of file diff --git a/Zero.Data/Zero.Data.csproj b/Zero.Data/Zero.Data.csproj index ce43002..5e29d09 100644 --- a/Zero.Data/Zero.Data.csproj +++ b/Zero.Data/Zero.Data.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + netstandard2.0 零代数据层 Web应用、微服务、应用服务、大数据计算等共用数据层，主要包括数据层实体类。一般只用于服务端 新生命开发团队 @@ -19,23 +19,17 @@ - - - - - - - - - + + + diff --git a/Zero.Data/xcodetool.exe b/Zero.Data/xcodetool.exe index ab51cc0..1fcac14 100644 Binary files a/Zero.Data/xcodetool.exe and b/Zero.Data/xcodetool.exe differ diff --git a/Zero.Desktop/Zero.Desktop.csproj b/Zero.Desktop/Zero.Desktop.csproj index 8f6fa9b..886d00e 100644 --- a/Zero.Desktop/Zero.Desktop.csproj +++ b/Zero.Desktop/Zero.Desktop.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/Zero.GtkForm/Zero.GtkForm.csproj b/Zero.GtkForm/Zero.GtkForm.csproj index 000ca48..5144e80 100644 --- a/Zero.GtkForm/Zero.GtkForm.csproj +++ b/Zero.GtkForm/Zero.GtkForm.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/Zero.HttpServer/Zero.HttpServer.csproj b/Zero.HttpServer/Zero.HttpServer.csproj index 18a3f38..1a7b0a1 100644 --- a/Zero.HttpServer/Zero.HttpServer.csproj +++ b/Zero.HttpServer/Zero.HttpServer.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/Zero.RpcServer/Zero.RpcServer.csproj b/Zero.RpcServer/Zero.RpcServer.csproj index 07a57b2..afc58ec 100644 --- a/Zero.RpcServer/Zero.RpcServer.csproj +++ b/Zero.RpcServer/Zero.RpcServer.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Zero.Server/Zero.Server.csproj b/Zero.Server/Zero.Server.csproj index 984ed4f..ecf6bb0 100644 --- a/Zero.Server/Zero.Server.csproj +++ b/Zero.Server/Zero.Server.csproj @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/Zero.TcpServer/Zero.TcpServer.csproj b/Zero.TcpServer/Zero.TcpServer.csproj index e514706..e47863a 100644 --- a/Zero.TcpServer/Zero.TcpServer.csproj +++ b/Zero.TcpServer/Zero.TcpServer.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Zero.Web/Zero.Web.csproj b/Zero.Web/Zero.Web.csproj index 73024e4..c96ca01 100644 --- a/Zero.Web/Zero.Web.csproj +++ b/Zero.Web/Zero.Web.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/Zero.WebApi/Zero.WebApi.csproj b/Zero.WebApi/Zero.WebApi.csproj index 13e66fe..abb8ade 100644 --- a/Zero.WebApi/Zero.WebApi.csproj +++ b/Zero.WebApi/Zero.WebApi.csproj @@ -32,12 +32,12 @@ - - + + - - - + + + diff --git a/Zero.WebSocketServer/Zero.WebSocketServer.csproj b/Zero.WebSocketServer/Zero.WebSocketServer.csproj index dad5e4b..ea23b7b 100644 --- a/Zero.WebSocketServer/Zero.WebSocketServer.csproj +++ b/Zero.WebSocketServer/Zero.WebSocketServer.csproj @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/Zero.WebView/Zero.WebView.csproj b/Zero.WebView/Zero.WebView.csproj index bf9f7bd..199b78c 100644 --- a/Zero.WebView/Zero.WebView.csproj +++ b/Zero.WebView/Zero.WebView.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Zero.Worker/MqttWorker.cs b/Zero.Worker/MqttWorker.cs index 58dc363..bf0958d 100644 --- a/Zero.Worker/MqttWorker.cs +++ b/Zero.Worker/MqttWorker.cs @@ -1,4 +1,5 @@ -using NewLife.Log; +using NewLife.Data; +using NewLife.Log; using NewLife.MQTT; namespace Zero.Worker; diff --git a/Zero.Worker/Zero.Worker.csproj b/Zero.Worker/Zero.Worker.csproj index ba5649d..294adf0 100644 --- a/Zero.Worker/Zero.Worker.csproj +++ b/Zero.Worker/Zero.Worker.csproj @@ -20,10 +20,10 @@ - - - - - + + + + +