新增net6/net7/net8输出，支持JsonPropertyName指定Json属性名，解决序列化问题

NewLifeX · Nov 6, 2024 · c7fbcae · c7fbcae
1 parent 24da5d1
commit c7fbcae
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/NewLife.IoT/NewLife.IoT.csproj b/NewLife.IoT/NewLife.IoT.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net40;net45;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net40;net45;net461;net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyTitle>IoT Standard</AssemblyTitle>
     <Description>IoT standard library, which defines various communication protocol standards and specifications in the Internet of Things field, without specific implementation. Used for IoT platform construction and unifying various hardware driver protocols. IoT标准库，定义物联网领域的各种通信协议标准规范，不含具体实现。用于IoT平台建设，以及统一各种硬件驱动协议</Description>
     <Company>新生命开发团队</Company>

diff --git a/NewLife.IoT/ThingSpecification/EventSpec.cs b/NewLife.IoT/ThingSpecification/EventSpec.cs
@@ -1,4 +1,7 @@
 using System.Runtime.Serialization;
+#if NETCOREAPP
+using System.Text.Json.Serialization;
+#endif
 
 namespace NewLife.IoT.ThingSpecification;
 
@@ -19,7 +22,10 @@ public class EventSpec : SpecBase
     /// <summary>
     /// 描述
     /// </summary>
-    [DataMember(Name="desc")]
+#if NETCOREAPP
+    [JsonPropertyName("desc")]
+#endif
+    [DataMember(Name = "desc")]
     public String? Description { get; set; }
 
     /// <summary>

diff --git a/NewLife.IoT/ThingSpecification/PropertyExtend.cs b/NewLife.IoT/ThingSpecification/PropertyExtend.cs
@@ -2,6 +2,9 @@
 using System.Xml.Serialization;
 using NewLife.Collections;
 using NewLife.IoT.ThingModels;
+#if NETCOREAPP
+using System.Text.Json.Serialization;
+#endif
 
 namespace NewLife.IoT.ThingSpecification;
 
@@ -13,6 +16,9 @@ public class PropertyExtend : IDictionarySource
 {
     #region 属性
     /// <summary>唯一标识</summary>
+#if NETCOREAPP
+    [JsonPropertyName("identifier")]
+#endif
     [DataMember(Name = "identifier")]
     public String Id { get; set; } = null!;
 

diff --git a/NewLife.IoT/ThingSpecification/ServiceSpec.cs b/NewLife.IoT/ThingSpecification/ServiceSpec.cs
@@ -1,5 +1,8 @@
 using System.Reflection;
 using System.Runtime.Serialization;
+#if NETCOREAPP
+using System.Text.Json.Serialization;
+#endif
 
 namespace NewLife.IoT.ThingSpecification;
 
@@ -15,12 +18,18 @@ public class ServiceSpec : SpecBase
     /// <summary>
     /// 调用类型。sync/async
     /// </summary>
+#if NETCOREAPP
+    [JsonPropertyName("callType")]
+#endif
     [DataMember(Name = "callType")]
     public String? Type { get; set; }
 
     /// <summary>
     /// 描述
     /// </summary>
+#if NETCOREAPP
+    [JsonPropertyName("desc")]
+#endif
     [DataMember(Name = "desc")]
     public String? Description { get; set; }
 

diff --git a/NewLife.IoT/ThingSpecification/SpecBase.cs b/NewLife.IoT/ThingSpecification/SpecBase.cs
@@ -1,4 +1,7 @@
 using System.Runtime.Serialization;
+#if NETCOREAPP
+using System.Text.Json.Serialization;
+#endif
 
 namespace NewLife.IoT.ThingSpecification;
 
@@ -11,6 +14,9 @@ public abstract class SpecBase
     /// <summary>
     /// 唯一标识
     /// </summary>
+#if NETCOREAPP
+    [JsonPropertyName("identifier")]
+#endif
     [DataMember(Name = "identifier")]
     public String Id { get; set; } = null!;