Skip to content

Commit

Permalink
Update packages performance upgrade (#88)
Browse files Browse the repository at this point in the history
* Update .Net Core from 1.4.371.60 to 1.5.374.158.

Add other dependencies that were missing to get configuration to work correctly.

Changes were made to Core Stack/Opc.Ua.Core/Types/BuiltIn/NodeId.cs June 2023 that changes the Parse of the NodeId.  Previously, it would return Null in the case that a parse couldn't happen, now an exception takes place.

Opc.Ua.Core NodeId InternalParse now throw exceptions when unsuccessfully creating a nodeId, causing severe slowdown in performance.

* Remove FindNode from AddModifyAttribute as it never succeeded.
  • Loading branch information
Archie-Miller authored Jan 7, 2025
1 parent 72aac8c commit f1a1318
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
8 changes: 0 additions & 8 deletions NodeSetToAML.cs
Original file line number Diff line number Diff line change
Expand Up @@ -694,14 +694,6 @@ private string GetLocaleId( NodeSet.LocalizedText localizedText, ref string last
private AttributeType AddModifyAttribute(AttributeSequence seq, string name, string refDataType, Variant val, bool bListOf = false, string sURI = uaNamespaceURI)
{
string sUADataType = refDataType;

var DataTypeNode = m_modelManager.FindNode<UANode>(refDataType);
if (DataTypeNode != null)
{
sUADataType = DataTypeNode.DecodedBrowseName.Name;
sURI = m_modelManager.FindModelUri(DataTypeNode.DecodedNodeId);
}

string ListOfPrefix = "";
if (bListOf == true)
ListOfPrefix = ListOf;
Expand Down
5 changes: 4 additions & 1 deletion Opc2Aml.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<ItemGroup>
<PackageReference Include="Aml.Engine" Version="3.1.1" />
<PackageReference Include="Aml.Engine.Resources" Version="3.0.0" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.60" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions OrderModelInfo.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
using MarkdownProcessor;
using MarkdownProcessor.NodeSet;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Opc2Aml
{
Expand Down
2 changes: 1 addition & 1 deletion SystemTest/SystemTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.60" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions SystemTest/TestComplexRootNamespace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public void TestDataSetMetaData()
ValidateQualifiedName( structureDataType, "Name", RootLevel, "Structure Description One" );

AttributeType structureDefinition = GetAttribute( structureDataType, "StructureDefinition", validateSubAttributes: true );
ValidateNodeId( structureDefinition, "DefaultEncodingId", LevelOne, new NodeId( "EncodingOne" ) );
ValidateNodeId( structureDefinition, "BaseDataType", LevelOne, new NodeId( "BaseDataTypeOne" ) );
ValidateNodeId( structureDefinition, "DefaultEncodingId", LevelOne, new NodeId( "EncodingOne", 1 ) );
ValidateNodeId( structureDefinition, "BaseDataType", LevelOne, new NodeId( "BaseDataTypeOne", 1 ) );

AttributeType structureType = GetAttribute( structureDefinition, "StructureType", validateSubAttributes: false );
Assert.AreEqual( "Structure", structureType.Value );
Expand Down

0 comments on commit f1a1318

Please sign in to comment.