Skip to content

Commit 29861fb

Browse files
authored
Revert "merge main374 into current branch (#2952)" (#2958)
This reverts commit b64ed8b.
1 parent b64ed8b commit 29861fb

File tree

76 files changed

+728
-1281
lines changed

Some content is hidden

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

76 files changed

+728
-1281
lines changed

.editorconfig

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

1716
# Code files
1817
[*.{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-
using System.Globalization;
31+
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(CultureInfo.InvariantCulture);
275+
dueTo = " due to TimedShelve of " + shelvingTime.ToString();
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-
using System.Globalization;
31+
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(CultureInfo.InvariantCulture) +
171+
Log("ReportEvent", " Value " + m_alarmController.GetValue().ToString() +
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-
using System.Globalization;
31+
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(CultureInfo.InvariantCulture) + ", active = " + active.ToString();
88+
message = "Discrete Alarm analog value = " + value.ToString() + ", active = " + active.ToString();
8989
}
9090

9191
base.SetValue(message);

Applications/Quickstarts.Servers/Boiler/BoilerNodeManager.cs

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

30-
using System;
3130
using System.Collections.Generic;
3231
using System.Reflection;
3332
using Opc.Ua;

Applications/Quickstarts.Servers/MemoryBuffer/MemoryBufferNodeManager.cs

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

4342
namespace MemoryBuffer
4443
{
@@ -235,7 +234,7 @@ protected override object GetManagerHandle(ISystemContext context, NodeId nodeId
235234
}
236235

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

240239
if (offset >= buffer.SizeInBytes.Value)
241240
{

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", CultureInfo.InvariantCulture));
1693+
string newName = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, i.ToString("000"));
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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
using System;
3131
using System.Collections.Generic;
32-
using System.Globalization;
3332
using Opc.Ua;
3433
using Range = Opc.Ua.Range;
3534

@@ -143,7 +142,7 @@ public ServiceResult OnWriteAnalogValue(
143142
element = ((Variant)element).Value;
144143
}
145144

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

148147
if (elementNumber > range.High || elementNumber < range.Low)
149148
{
@@ -154,7 +153,7 @@ public ServiceResult OnWriteAnalogValue(
154153
return ServiceResult.Good;
155154
}
156155

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

159158
if (number > range.High || number < range.Low)
160159
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
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.3.2" />
24-
<PackageReference Include="NUnit.Console" Version="3.19.0" />
23+
<PackageReference Include="NUnit" Version="4.3.1" />
24+
<PackageReference Include="NUnit.Console" Version="3.18.3" />
2525
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -31,7 +31,7 @@
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
3333
<PackageReference Include="SharpFuzz" Version="2.2.0" />
34-
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
34+
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
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>$(AssemblyPrefix).Client.ComplexTypes</AssemblyName>
4+
<AssemblyName>Opc.Ua.Client.ComplexTypes</AssemblyName>
55
<TargetFrameworks>$(LibxTargetFrameworks)</TargetFrameworks>
6-
<PackageId>$(PackagePrefix).Opc.Ua.Client.ComplexTypes</PackageId>
6+
<PackageId>OPCFoundation.NetStandard.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)