Skip to content

Commit 9a434b8

Browse files
authored
Fix misc. build issues and warnings (#2908)
- Fix errors and warnings on stricter build systems. - Some Linux distri do not support brainpool, detect if tests can be run.
1 parent dc661ba commit 9a434b8

File tree

25 files changed

+83
-49
lines changed

25 files changed

+83
-49
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/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/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
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Opc.Ua.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>

Libraries/Opc.Ua.Client/Opc.Ua.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DefineConstants>$(DefineConstants);CLIENT_ASYNC</DefineConstants>
55
<AssemblyName>Opc.Ua.Client</AssemblyName>
66
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
7-
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Client</PackageId>
7+
<PackageId>$(PackagePrefix).Opc.Ua.Client</PackageId>
88
<RootNamespace>Opc.Ua.Client</RootNamespace>
99
<Description>OPC UA Client Class Library</Description>
1010
<IsPackable>true</IsPackable>

Libraries/Opc.Ua.Client/Session/TraceableSession.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public int OperationTimeout
287287

288288
/// <inheritdoc/>
289289
public bool CheckDomain => m_session.CheckDomain;
290-
290+
291291
/// <inheritdoc/>
292292
public ContinuationPointPolicy ContinuationPointPolicy
293293
{
@@ -661,7 +661,7 @@ public void ReadValues(IList<NodeId> variableIds, IList<Type> expectedTypes, out
661661
m_session.ReadValues(variableIds, expectedTypes, out values, out errors);
662662
}
663663
}
664-
664+
665665
/// <inheritdoc/>
666666
public byte[] ReadByteStringInChunks(NodeId nodeId)
667667
{
@@ -671,8 +671,8 @@ public byte[] ReadByteStringInChunks(NodeId nodeId)
671671
}
672672
}
673673

674-
/// <inheritdoc/>
675-
public void ReadDisplayName(IList<NodeId> nodeIds, out IList<string> displayNames, out IList<ServiceResult> errors)
674+
/// <inheritdoc/>
675+
public void ReadDisplayName(IList<NodeId> nodeIds, out IList<string> displayNames, out IList<ServiceResult> errors)
676676
{
677677
using (Activity activity = ActivitySource.StartActivity())
678678
{
@@ -1289,18 +1289,17 @@ public void ManagedBrowse(RequestHeader requestHeader, ViewDescription view, ILi
12891289
{
12901290
m_session.ManagedBrowse(requestHeader, view, nodesToBrowse, maxResultsToReturn, browseDirection, referenceTypeId, includeSubtypes, nodeClassMask, out result, out errors);
12911291
}
1292-
12931292
}
12941293

12951294
/// <inheritdoc/>
1296-
public async Task<(
1295+
public Task<(
12971296
IList<ReferenceDescriptionCollection>,
12981297
IList<ServiceResult>
12991298
)> ManagedBrowseAsync(RequestHeader requestHeader, ViewDescription view, IList<NodeId> nodesToBrowse, uint maxResultsToReturn, BrowseDirection browseDirection, NodeId referenceTypeId, bool includeSubtypes, uint nodeClassMask, CancellationToken ct = default)
13001299
{
13011300
using (Activity activity = ActivitySource.StartActivity())
13021301
{
1303-
return await m_session.ManagedBrowseAsync(requestHeader, view, nodesToBrowse, maxResultsToReturn, browseDirection, referenceTypeId, includeSubtypes, nodeClassMask, ct);
1302+
return m_session.ManagedBrowseAsync(requestHeader, view, nodesToBrowse, maxResultsToReturn, browseDirection, referenceTypeId, includeSubtypes, nodeClassMask, ct);
13041303
}
13051304
}
13061305

Libraries/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Opc.Ua.Configuration</AssemblyName>
55
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
6-
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Configuration</PackageId>
6+
<PackageId>$(PackagePrefix).Opc.Ua.Configuration</PackageId>
77
<RootNamespace>Opc.Ua.Configuration</RootNamespace>
88
<Description>OPC UA Configuration Class Library</Description>
99
<IsPackable>true</IsPackable>

Libraries/Opc.Ua.Gds.Client.Common/Opc.Ua.Gds.Client.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Opc.Ua.Gds.Client.Common</AssemblyName>
55
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
6-
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common</PackageId>
6+
<PackageId>$(PackagePrefix).Opc.Ua.Gds.Client.Common</PackageId>
77
<RootNamespace>Opc.Ua.Gds.Client</RootNamespace>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<Description>OPC UA GDS Client Class Library</Description>

Libraries/Opc.Ua.Gds.Server.Common/Opc.Ua.Gds.Server.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Opc.Ua.Gds.Server.Common</AssemblyName>
55
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
6-
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common</PackageId>
6+
<PackageId>$(PackagePrefix).Opc.Ua.Gds.Server.Common</PackageId>
77
<RootNamespace>Opc.Ua.Gds.Server</RootNamespace>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<Description>OPC UA GDS Server Class Library</Description>

0 commit comments

Comments
 (0)