Skip to content

Commit ef645f6

Browse files
mregenmregen
authored
Merge pull request #2944 from OPCFoundation/develop/main374
Merge develop/main374 in release branch
2 parents f5d00d9 + 61056d0 commit ef645f6

File tree

79 files changed

+1336
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1336
-729
lines changed

‎.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ root = true
1212
# All files
1313
[*]
1414
indent_style = space
15+
tab_width = 4
1516

1617
# Code files
1718
[*.{cs,csx,vb,vbx}]

‎Applications/Quickstarts.Servers/Alarms/AlarmHolders/AlarmConditionTypeHolder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* ======================================================================*/
2929

3030
using System;
31-
31+
using System.Globalization;
3232
using Opc.Ua;
3333

3434
#pragma warning disable CS1591
@@ -272,7 +272,7 @@ private ServiceResult OnShelve(
272272
}
273273
else
274274
{
275-
dueTo = " due to TimedShelve of " + shelvingTime.ToString();
275+
dueTo = " due to TimedShelve of " + shelvingTime.ToString(CultureInfo.InvariantCulture);
276276
}
277277
}
278278
else

‎Applications/Quickstarts.Servers/Alarms/AlarmHolders/ConditionTypeHolder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* ======================================================================*/
2929

3030
using System;
31-
31+
using System.Globalization;
3232
using Opc.Ua;
3333

3434
#pragma warning disable CS1591
@@ -168,7 +168,7 @@ public void ReportEvent(ConditionState alarm = null)
168168
alarm.Time.Value = DateTime.UtcNow;
169169
alarm.ReceiveTime.Value = alarm.Time.Value;
170170

171-
Log("ReportEvent", " Value " + m_alarmController.GetValue().ToString() +
171+
Log("ReportEvent", " Value " + m_alarmController.GetValue().ToString(CultureInfo.InvariantCulture) +
172172
" Message " + alarm.Message.Value.Text);
173173

174174
alarm.ClearChangeMasks(SystemContext, true);

‎Applications/Quickstarts.Servers/Alarms/AlarmHolders/DiscreteHolder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* ======================================================================*/
2929

3030
using System;
31-
31+
using System.Globalization;
3232
using Opc.Ua;
3333

3434
#pragma warning disable CS0219
@@ -85,7 +85,7 @@ public override void SetValue(string message = "")
8585

8686
if (message.Length == 0)
8787
{
88-
message = "Discrete Alarm analog value = " + value.ToString() + ", active = " + active.ToString();
88+
message = "Discrete Alarm analog value = " + value.ToString(CultureInfo.InvariantCulture) + ", active = " + active.ToString();
8989
}
9090

9191
base.SetValue(message);

‎Applications/Quickstarts.Servers/Boiler/BoilerNodeManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* http://opcfoundation.org/License/MIT/1.00/
2828
* ======================================================================*/
2929

30+
using System;
3031
using System.Collections.Generic;
3132
using System.Reflection;
3233
using Opc.Ua;

‎Applications/Quickstarts.Servers/MemoryBuffer/MemoryBufferNodeManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
using Opc.Ua.Server;
3939
using Opc.Ua.Sample;
4040
using System.Reflection;
41+
using System.Globalization;
4142

4243
namespace MemoryBuffer
4344
{
@@ -234,7 +235,7 @@ protected override object GetManagerHandle(ISystemContext context, NodeId nodeId
234235
}
235236

236237
// check range on offset.
237-
uint offset = Convert.ToUInt32(offsetText);
238+
uint offset = Convert.ToUInt32(offsetText, CultureInfo.InvariantCulture);
238239

239240
if (offset >= buffer.SizeInBytes.Value)
240241
{

‎Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ private DataItemState[] CreateDataItemVariables(NodeState parent, string path, s
16901690
// now to create the remaining NUMBERED items
16911691
for (uint i = 0; i < numVariables; i++)
16921692
{
1693-
string newName = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, i.ToString("000"));
1693+
string newName = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, i.ToString("000", CultureInfo.InvariantCulture));
16941694
string newPath = string.Format(CultureInfo.InvariantCulture, "{0}/Mass/{1}", path, newName);
16951695
itemsCreated.Add(CreateDataItemVariable(parent, newPath, newName, dataType, valueRank));
16961696
}//for i

‎Applications/Quickstarts.Servers/TestData/TestDataObjectState.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
using System;
3131
using System.Collections.Generic;
32+
using System.Globalization;
3233
using Opc.Ua;
3334
using Range = Opc.Ua.Range;
3435

@@ -142,7 +143,7 @@ public ServiceResult OnWriteAnalogValue(
142143
element = ((Variant)element).Value;
143144
}
144145

145-
double elementNumber = Convert.ToDouble(element);
146+
double elementNumber = Convert.ToDouble(element, CultureInfo.InvariantCulture);
146147

147148
if (elementNumber > range.High || elementNumber < range.Low)
148149
{
@@ -153,7 +154,7 @@ public ServiceResult OnWriteAnalogValue(
153154
return ServiceResult.Good;
154155
}
155156

156-
double number = Convert.ToDouble(value);
157+
double number = Convert.ToDouble(value, CultureInfo.InvariantCulture);
157158

158159
if (number > range.High || number < range.Low)
159160
{

‎Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
23-
<PackageReference Include="NUnit" Version="4.2.2" />
24-
<PackageReference Include="NUnit.Console" Version="3.18.3" />
23+
<PackageReference Include="NUnit" Version="4.3.2" />
24+
<PackageReference Include="NUnit.Console" Version="3.19.0" />
2525
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="coverlet.collector" Version="6.0.2">
29+
<PackageReference Include="coverlet.collector" Version="6.0.3">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="SharpFuzz" Version="2.1.1" />
34-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
33+
<PackageReference Include="SharpFuzz" Version="2.2.0" />
34+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎Libraries/Opc.Ua.Client.ComplexTypes/Opc.Ua.Client.ComplexTypes.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<AssemblyName>Opc.Ua.Client.ComplexTypes</AssemblyName>
4+
<AssemblyName>$(AssemblyPrefix).Client.ComplexTypes</AssemblyName>
55
<TargetFrameworks>$(LibxTargetFrameworks)</TargetFrameworks>
6-
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes</PackageId>
6+
<PackageId>$(PackagePrefix).Opc.Ua.Client.ComplexTypes</PackageId>
77
<RootNameSpace>Opc.Ua.Client.ComplexTypes</RootNameSpace>
88
<Description>OPC UA Complex Types Client Class Library</Description>
99
<IsPackable>true</IsPackable>

0 commit comments

Comments
 (0)