升级12月基础组件

NewLifeX · Dec 16, 2024 · a613d01 · a613d01
1 parent 04496ac
commit a613d01
Show file tree

Hide file tree

Showing 37 changed files with 86 additions and 735 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,10 +1,10 @@
-# 新生命模版包
+# 新生命模版包
 
-网站：https://newlifex.com
+网站：https://newlifex.com
 
-QQ群：dotNET 1600800 / 嵌入式 1600838
+QQ群：dotNET 1600800 / 嵌入式 1600838
 
 
-新生命团队（NewLife）成立于2002年，是新时代物联网行业解决方案提供者，致力于提供软硬件应用方案咨询、系统架构规划与开发服务。
+新生命团队（NewLife）成立于2002年，是新时代物联网行业解决方案提供者，致力于提供软硬件应用方案咨询、系统架构规划与开发服务。
 
-团队主导的开源 NewLife 系列组件已被广泛应用于各行业，成功的应用于电力、高校、互联网、电信、交通、物流、工控、医疗、文博等行业，为客户提供了大量先进、可靠、安全、高质量、易扩展的产品和系统集成服务。Nuget累计下载量高达300余万次。初步估算，直接受益的软件项目数十万个，项目涉及生活方方面面，惠及数十亿人。
+团队主导的开源 NewLife 系列组件已被广泛应用于各行业，成功的应用于电力、高校、互联网、电信、交通、物流、工控、医疗、文博等行业，为客户提供了大量先进、可靠、安全、高质量、易扩展的产品和系统集成服务。Nuget累计下载量高达300余万次。初步估算，直接受益的软件项目数十万个，项目涉及生活方方面面，惠及数十亿人。
diff --git a/Zero.Agent/Zero.Agent.csproj b/Zero.Agent/Zero.Agent.csproj
@@ -23,10 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Agent" Version="10.9.2024.902" />
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
-    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1101" />
-    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1101" />
+    <PackageReference Include="NewLife.Agent" Version="10.10.2024.1202" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1206" />
+    <PackageReference Include="NewLife.Stardust" Version="3.2.2024.1211" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1202" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Agent2/Zero.Agent2.csproj b/Zero.Agent2/Zero.Agent2.csproj
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Extensions.Hosting.AgentService" Version="10.9.2024.902" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.1.2024.1101" />
+    <PackageReference Include="NewLife.Extensions.Hosting.AgentService" Version="10.10.2024.1202" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.2.2024.1211" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.AntJob/Zero.AntJob.csproj b/Zero.AntJob/Zero.AntJob.csproj
@@ -30,9 +30,9 @@
   <ItemGroup>
     <PackageReference Include="NewLife.AntJob" Version="4.0.2024.904" />
     <PackageReference Include="NewLife.AntJob.Extensions" Version="3.4.2024.904" />
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
-    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1101" />
-    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1101" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1206" />
+    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1205" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1202" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Zero.Client/Zero.Client.csproj b/Zero.Client/Zero.Client.csproj
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
-    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.708" />
-    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1101" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1206" />
+    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.1212" />
+    <PackageReference Include="NewLife.Stardust" Version="3.2.2024.1211" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -25,10 +25,10 @@
     <Using Include="NewLife.Reflection" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.708" />
-    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1101" />
-    <PackageReference Include="NewLife.RocketMQ" Version="2.6.2024.1004" />
-    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1101" />
+    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.1212" />
+    <PackageReference Include="NewLife.Redis" Version="6.0.2024.1205" />
+    <PackageReference Include="NewLife.RocketMQ" Version="2.6.2024.1212" />
+    <PackageReference Include="NewLife.Stardust" Version="3.2.2024.1211" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Core/Zero.Core.csproj b/Zero.Core/Zero.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>Zero</RootNamespace>
     <AssemblyTitle>零代核心库</AssemblyTitle>
     <Description>Web应用、微服务、应用服务、大数据计算和客户端等多个端共用的类库，例如模型类等。原则上要求最少依赖第三方</Description>
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
-    <PackageReference Include="NewLife.Remoting" Version="3.1.2024.1101" />
+    <PackageReference Include="NewLife.Core" Version="11.1.2024.1206" />
+    <PackageReference Include="NewLife.Remoting" Version="3.2.2024.1206" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Data/Interfaces/IMember.cs b/Zero.Data/Interfaces/IMember.cs
diff --git a/Zero.Data/Interfaces/IProduct.cs b/Zero.Data/Interfaces/IProduct.cs
diff --git a/Zero.Data/Interfaces/IStory.cs b/Zero.Data/Interfaces/IStory.cs
diff --git a/Zero.Data/Interfaces/ITeam.cs b/Zero.Data/Interfaces/ITeam.cs
diff --git a/Zero.Data/Interfaces/ITeamMember.cs b/Zero.Data/Interfaces/ITeamMember.cs