Merge pull request #2950 from romanett/mergeDurable

Merge develop/main374 into develop/durable
OPCFoundation · Jan 20, 2025 · 60152f1 · 60152f1
2 parents 7830dfe + 5a03baf
commit 60152f1
Show file tree

Hide file tree

Showing 79 changed files with 1,340 additions and 730 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,7 @@ root = true
 # All files
 [*]
 indent_style = space
+tab_width    = 4
 
 # Code files
 [*.{cs,csx,vb,vbx}]

diff --git a/Applications/Quickstarts.Servers/Alarms/AlarmHolders/AlarmConditionTypeHolder.cs b/Applications/Quickstarts.Servers/Alarms/AlarmHolders/AlarmConditionTypeHolder.cs
@@ -28,7 +28,7 @@
  * ======================================================================*/
 
 using System;
-
+using System.Globalization;
 using Opc.Ua;
 
 #pragma warning disable CS1591
@@ -272,7 +272,7 @@ private ServiceResult OnShelve(
                 }
                 else
                 {
-                    dueTo = " due to TimedShelve of " + shelvingTime.ToString();
+                    dueTo = " due to TimedShelve of " + shelvingTime.ToString(CultureInfo.InvariantCulture);
                 }
             }
             else

diff --git a/Applications/Quickstarts.Servers/Alarms/AlarmHolders/ConditionTypeHolder.cs b/Applications/Quickstarts.Servers/Alarms/AlarmHolders/ConditionTypeHolder.cs
@@ -28,7 +28,7 @@
  * ======================================================================*/
 
 using System;
-
+using System.Globalization;
 using Opc.Ua;
 
 #pragma warning disable CS1591
@@ -168,7 +168,7 @@ public void ReportEvent(ConditionState alarm = null)
                 alarm.Time.Value = DateTime.UtcNow;
                 alarm.ReceiveTime.Value = alarm.Time.Value;
 
-                Log("ReportEvent", " Value " + m_alarmController.GetValue().ToString() +
+                Log("ReportEvent", " Value " + m_alarmController.GetValue().ToString(CultureInfo.InvariantCulture) +
                     " Message " + alarm.Message.Value.Text);
 
                 alarm.ClearChangeMasks(SystemContext, true);

diff --git a/Applications/Quickstarts.Servers/Alarms/AlarmHolders/DiscreteHolder.cs b/Applications/Quickstarts.Servers/Alarms/AlarmHolders/DiscreteHolder.cs
@@ -28,7 +28,7 @@
  * ======================================================================*/
 
 using System;
-
+using System.Globalization;
 using Opc.Ua;
 
 #pragma warning disable CS0219
@@ -85,7 +85,7 @@ public override void SetValue(string message = "")
 
             if (message.Length == 0)
             {
-                message = "Discrete Alarm analog value = " + value.ToString() + ", active = " + active.ToString();
+                message = "Discrete Alarm analog value = " + value.ToString(CultureInfo.InvariantCulture) + ", active = " + active.ToString();
             }
 
             base.SetValue(message);

diff --git a/Applications/Quickstarts.Servers/Boiler/BoilerNodeManager.cs b/Applications/Quickstarts.Servers/Boiler/BoilerNodeManager.cs
@@ -27,6 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Opc.Ua;

diff --git a/Applications/Quickstarts.Servers/MemoryBuffer/MemoryBufferNodeManager.cs b/Applications/Quickstarts.Servers/MemoryBuffer/MemoryBufferNodeManager.cs
@@ -38,6 +38,7 @@
 using Opc.Ua.Server;
 using Opc.Ua.Sample;
 using System.Reflection;
+using System.Globalization;
 
 namespace MemoryBuffer
 {
@@ -234,7 +235,7 @@ protected override object GetManagerHandle(ISystemContext context, NodeId nodeId
                     }
 
                     // check range on offset.
-                    uint offset = Convert.ToUInt32(offsetText);
+                    uint offset = Convert.ToUInt32(offsetText, CultureInfo.InvariantCulture);
 
                     if (offset >= buffer.SizeInBytes.Value)
                     {

diff --git a/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs b/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs
@@ -1690,7 +1690,7 @@ private DataItemState[] CreateDataItemVariables(NodeState parent, string path, s
             // now to create the remaining NUMBERED items
             for (uint i = 0; i < numVariables; i++)
             {
-                string newName = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, i.ToString("000"));
+                string newName = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, i.ToString("000", CultureInfo.InvariantCulture));
                 string newPath = string.Format(CultureInfo.InvariantCulture, "{0}/Mass/{1}", path, newName);
                 itemsCreated.Add(CreateDataItemVariable(parent, newPath, newName, dataType, valueRank));
             }//for i

diff --git a/Applications/Quickstarts.Servers/TestData/TestDataObjectState.cs b/Applications/Quickstarts.Servers/TestData/TestDataObjectState.cs
@@ -29,6 +29,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using Opc.Ua;
 using Range = Opc.Ua.Range;
 
@@ -142,7 +143,7 @@ public ServiceResult OnWriteAnalogValue(
                             element = ((Variant)element).Value;
                         }
 
-                        double elementNumber = Convert.ToDouble(element);
+                        double elementNumber = Convert.ToDouble(element, CultureInfo.InvariantCulture);
 
                         if (elementNumber > range.High || elementNumber < range.Low)
                         {
@@ -153,7 +154,7 @@ public ServiceResult OnWriteAnalogValue(
                     return ServiceResult.Good;
                 }
 
-                double number = Convert.ToDouble(value);
+                double number = Convert.ToDouble(value, CultureInfo.InvariantCulture);
 
                 if (number > range.High || number < range.Low)
                 {

diff --git a/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj b/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj
@@ -20,18 +20,18 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit.Console" Version="3.18.3" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Console" Version="3.19.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SharpFuzz" Version="2.1.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="SharpFuzz" Version="2.2.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Libraries/Opc.Ua.Client.ComplexTypes/Opc.Ua.Client.ComplexTypes.csproj b/Libraries/Opc.Ua.Client.ComplexTypes/Opc.Ua.Client.ComplexTypes.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>Opc.Ua.Client.ComplexTypes</AssemblyName>
+    <AssemblyName>$(AssemblyPrefix).Client.ComplexTypes</AssemblyName>
     <TargetFrameworks>$(LibxTargetFrameworks)</TargetFrameworks>
-    <PackageId>OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes</PackageId>
+    <PackageId>$(PackagePrefix).Opc.Ua.Client.ComplexTypes</PackageId>
     <RootNameSpace>Opc.Ua.Client.ComplexTypes</RootNameSpace>
     <Description>OPC UA Complex Types Client Class Library</Description>
     <IsPackable>true</IsPackable>