Resolve merge conflict, keep version 0.9.3-dev

Author: longkerdandy

SparklerNet.Tests/Core/Model/DataSetTests.cs

@@ -142,7 +142,7 @@ public void RowCount_Returns_Correct_Value_With_TryGetValue()
         var dataSet = new DataSet
         {
             Columns = ["Column1", "Column2"]
-            // ColumnData intentionally aren't initialized with Column1 to test TryGetValue
+            // ColumnData intentionally isn't initialized with Column1 to test TryGetValue
         };
         Assert.Equal(0, dataSet.RowCount);
         // Add data to Column1

SparklerNet/Core/Model/Conversion/MetricConverter.cs

@@ -52,7 +52,7 @@ public static ProtoMetric ToProtoMetric(this Metric metric)
                 ? Convert.ToUInt64(value)
                 : throw new NotSupportedException("Value for DateTime type must be long"),
             DataType.String or DataType.Text or DataType.UUID =>
-                () => protoMetric.StringValue = metric.Value!.ToString(),
+                () => protoMetric.StringValue = metric.Value!.ToString()!,
             DataType.Bytes or DataType.File => () => protoMetric.BytesValue = metric.Value is byte[] bytes
                 ? CopyFrom(bytes)
                 : throw new NotSupportedException("Value for Bytes/File type must be byte[]"),
@@ -127,8 +127,8 @@ public static Metric ToMetric(this ProtoMetric protoMetric)
                 DataType.DateTime => (long)protoMetric.LongValue,
                 DataType.String or DataType.Text or DataType.UUID => protoMetric.StringValue,
                 DataType.Bytes or DataType.File => protoMetric.BytesValue!.ToByteArray(),
-                DataType.DataSet => protoMetric.DatasetValue!.ToDataSet(),
-                DataType.Template => protoMetric.TemplateValue!.ToTemplate(),
+                DataType.DataSet => protoMetric.DatasetValue?.ToDataSet(),
+                DataType.Template => protoMetric.TemplateValue?.ToTemplate(),
                 DataType.Int8Array => DeserializeArray<sbyte>(protoMetric.BytesValue!.ToByteArray()),
                 DataType.UInt8Array => DeserializeArray<byte>(protoMetric.BytesValue!.ToByteArray()),
                 DataType.Int16Array => DeserializeArray<short>(protoMetric.BytesValue!.ToByteArray()),

SparklerNet/Core/Model/Conversion/PropertyConverter.cs

@@ -37,8 +37,8 @@ public static ProtoPropertyValue ToProtoPropertyValue(this PropertyValue propert
             DataType.Float => () => protoProperty.FloatValue = Convert.ToSingle(property.Value),
             DataType.Double => () => protoProperty.DoubleValue = Convert.ToDouble(property.Value),
             DataType.Boolean => () => protoProperty.BooleanValue = Convert.ToBoolean(property.Value),
-            DataType.DateTime => () => protoProperty.LongValue = property.Value is long value
-                ? Convert.ToUInt64(value)
+            DataType.DateTime => () => protoProperty.LongValue = property.Value is long
+                ? Convert.ToUInt64(property.Value)
                 : throw new NotSupportedException("Value for DateTime type must be long"),
             DataType.String or DataType.Text => () => protoProperty.StringValue = property.Value!.ToString()!,
             DataType.PropertySet when property.Value is PropertySet propertySet =>

SparklerNet/Core/Topics/SparkplugTopicParser.cs

@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using SparklerNet.Core.Constants;
 
 namespace SparklerNet.Core.Topics;
@@ -66,6 +67,6 @@ public static (SparkplugVersion version, string? groupId, SparkplugMessageType m
     // Pattern 2 (STATE messages): <namespace>/STATE/<host_id>
     [GeneratedRegex(
         "^(?<namespace>[^/]+)/(?<groupId>[^/]+)/(?<messageType>[^/]+)/(?<edgeNodeId>[^/]+)(/(?<deviceId>[^/]+))?$|^(?<namespace>[^/]+)/(STATE)/(?<hostId>[^/]+)$",
-        RegexOptions.IgnoreCase | RegexOptions.Compiled, "zh-CN")]
+        RegexOptions.IgnoreCase | RegexOptions.Compiled)]
     private static partial Regex TopicRegex();
 }

SparklerNet/HostApplication/SparkplugHostApplication.cs

@@ -62,7 +62,7 @@ public SparkplugHostApplication(MqttClientOptions mqttOptions, SparkplugClientOp
     // MQTT Client
     public IMqttClient MqttClient { get; }
 
-    [GeneratedRegex(@"[+/\\#]")]
+    [GeneratedRegex(@"[+/#]", RegexOptions.Compiled)]
     private static partial Regex HostApplicationIdRegex();
 
     public event Func<EdgeNodeMessageEventArgs, Task> EdgeNodeBirthReceivedAsync