Merge pull request #1531 from OPCFoundation/master

- Missed a few ModelCompiler fixes for errata 1.04.10 - fixed nodeset2 export to omit ArrayDimension = '0'
OPCFoundation · Oct 4, 2021 · 4fba7e5 · 4fba7e5
2 parents f9381b8 + bdde763
commit 4fba7e5
Show file tree

Hide file tree

Showing 10 changed files with 15,348 additions and 15,341 deletions.
diff --git a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
   </ItemGroup>
 

diff --git a/Stack/Opc.Ua.Core/Schema/Opc.Ua.NodeSet.xml b/Stack/Opc.Ua.Core/Schema/Opc.Ua.NodeSet.xml
diff --git a/Stack/Opc.Ua.Core/Schema/Opc.Ua.NodeSet2.xml b/Stack/Opc.Ua.Core/Schema/Opc.Ua.NodeSet2.xml
diff --git a/Stack/Opc.Ua.Core/Schema/Opc.Ua.Types.bsd b/Stack/Opc.Ua.Core/Schema/Opc.Ua.Types.bsd
@@ -875,27 +875,27 @@
     <opc:EnumeratedValue Name="InsufficientBandwidth" Value="1" />
     <opc:EnumeratedValue Name="InsufficientResources" Value="2" />
     <opc:EnumeratedValue Name="InsufficientTrafficClassBandwidth" Value="3" />
-    <opc:EnumeratedValue Name="StreamIDInUse" Value="4" />
+    <opc:EnumeratedValue Name="StreamIdInUse" Value="4" />
     <opc:EnumeratedValue Name="StreamDestinationAddressInUse" Value="5" />
     <opc:EnumeratedValue Name="StreamPreemptedByHigherRank" Value="6" />
     <opc:EnumeratedValue Name="LatencyHasChanged" Value="7" />
-    <opc:EnumeratedValue Name="EgressPortNotAVBCapable" Value="8" />
+    <opc:EnumeratedValue Name="EgressPortNotAvbCapable" Value="8" />
     <opc:EnumeratedValue Name="UseDifferentDestinationAddress" Value="9" />
-    <opc:EnumeratedValue Name="OutOfMSRPResources" Value="10" />
-    <opc:EnumeratedValue Name="OutOfMMRPResources" Value="11" />
+    <opc:EnumeratedValue Name="OutOfMsrpResources" Value="10" />
+    <opc:EnumeratedValue Name="OutOfMmrpResources" Value="11" />
     <opc:EnumeratedValue Name="CannotStoreDestinationAddress" Value="12" />
-    <opc:EnumeratedValue Name="PriorityIsNoAnSRCLass" Value="13" />
+    <opc:EnumeratedValue Name="PriorityIsNotAnSrcClass" Value="13" />
     <opc:EnumeratedValue Name="MaxFrameSizeTooLarge" Value="14" />
     <opc:EnumeratedValue Name="MaxFanInPortsLimitReached" Value="15" />
-    <opc:EnumeratedValue Name="FirstValueChangedForStreamID" Value="16" />
+    <opc:EnumeratedValue Name="FirstValueChangedForStreamId" Value="16" />
     <opc:EnumeratedValue Name="VlanBlockedOnEgress" Value="17" />
     <opc:EnumeratedValue Name="VlanTaggingDisabledOnEgress" Value="18" />
     <opc:EnumeratedValue Name="SrClassPriorityMismatch" Value="19" />
     <opc:EnumeratedValue Name="FeatureNotPropagated" Value="20" />
     <opc:EnumeratedValue Name="MaxLatencyExceeded" Value="21" />
-    <opc:EnumeratedValue Name="BridgeDoesNotProvideNetworkID" Value="22" />
+    <opc:EnumeratedValue Name="BridgeDoesNotProvideNetworkId" Value="22" />
     <opc:EnumeratedValue Name="StreamTransformNotSupported" Value="23" />
-    <opc:EnumeratedValue Name="StreamIDTypeNotSupported" Value="24" />
+    <opc:EnumeratedValue Name="StreamIdTypeNotSupported" Value="24" />
     <opc:EnumeratedValue Name="FeatureNotSupported" Value="25" />
   </opc:EnumeratedType>
 

diff --git a/Stack/Opc.Ua.Core/Schema/Opc.Ua.Types.xsd b/Stack/Opc.Ua.Core/Schema/Opc.Ua.Types.xsd
@@ -1976,27 +1976,27 @@
       <xs:enumeration value="InsufficientBandwidth_1" />
       <xs:enumeration value="InsufficientResources_2" />
       <xs:enumeration value="InsufficientTrafficClassBandwidth_3" />
-      <xs:enumeration value="StreamIDInUse_4" />
+      <xs:enumeration value="StreamIdInUse_4" />
       <xs:enumeration value="StreamDestinationAddressInUse_5" />
       <xs:enumeration value="StreamPreemptedByHigherRank_6" />
       <xs:enumeration value="LatencyHasChanged_7" />
-      <xs:enumeration value="EgressPortNotAVBCapable_8" />
+      <xs:enumeration value="EgressPortNotAvbCapable_8" />
       <xs:enumeration value="UseDifferentDestinationAddress_9" />
-      <xs:enumeration value="OutOfMSRPResources_10" />
-      <xs:enumeration value="OutOfMMRPResources_11" />
+      <xs:enumeration value="OutOfMsrpResources_10" />
+      <xs:enumeration value="OutOfMmrpResources_11" />
       <xs:enumeration value="CannotStoreDestinationAddress_12" />
-      <xs:enumeration value="PriorityIsNoAnSRCLass_13" />
+      <xs:enumeration value="PriorityIsNotAnSrcClass_13" />
       <xs:enumeration value="MaxFrameSizeTooLarge_14" />
       <xs:enumeration value="MaxFanInPortsLimitReached_15" />
-      <xs:enumeration value="FirstValueChangedForStreamID_16" />
+      <xs:enumeration value="FirstValueChangedForStreamId_16" />
       <xs:enumeration value="VlanBlockedOnEgress_17" />
       <xs:enumeration value="VlanTaggingDisabledOnEgress_18" />
       <xs:enumeration value="SrClassPriorityMismatch_19" />
       <xs:enumeration value="FeatureNotPropagated_20" />
       <xs:enumeration value="MaxLatencyExceeded_21" />
-      <xs:enumeration value="BridgeDoesNotProvideNetworkID_22" />
+      <xs:enumeration value="BridgeDoesNotProvideNetworkId_22" />
       <xs:enumeration value="StreamTransformNotSupported_23" />
-      <xs:enumeration value="StreamIDTypeNotSupported_24" />
+      <xs:enumeration value="StreamIdTypeNotSupported_24" />
       <xs:enumeration value="FeatureNotSupported_25" />
     </xs:restriction>
   </xs:simpleType>

diff --git a/Stack/Opc.Ua.Core/Schema/UANodeSetHelpers.cs b/Stack/Opc.Ua.Core/Schema/UANodeSetHelpers.cs
@@ -924,9 +924,13 @@ private string Export(Opc.Ua.QualifiedName source, NamespaceTable namespaceUris)
                         }
 
                         output.ValueRank = field.ValueRank;
+
                         if (field.ArrayDimensions != null && field.ArrayDimensions.Count != 0)
                         {
-                            output.ArrayDimensions = BaseVariableState.ArrayDimensionsToXml(field.ArrayDimensions);
+                            if (output.ValueRank > 1 || field.ArrayDimensions[0] > 0)
+                            {
+                                output.ArrayDimensions = BaseVariableState.ArrayDimensionsToXml(field.ArrayDimensions);
+                            }
                         }
 
                         output.MaxStringLength = field.MaxStringLength;
@@ -1038,9 +1042,12 @@ private Opc.Ua.DataTypeDefinition Import(UADataType dataType, Opc.Ua.Export.Data
                             output.Description = Import(field.Description);
                             output.DataType = ImportNodeId(field.DataType, namespaceUris, true);
                             output.ValueRank = field.ValueRank;
-                            if (!string.IsNullOrWhiteSpace(field.ArrayDimensions))
+                            if (!String.IsNullOrWhiteSpace(field.ArrayDimensions))
                             {
-                                output.ArrayDimensions = new UInt32Collection(BaseVariableState.ArrayDimensionsFromXml(field.ArrayDimensions));
+                                if (output.ValueRank > 1 || field.ArrayDimensions[0] > 0)
+                                {
+                                    output.ArrayDimensions = new UInt32Collection(BaseVariableState.ArrayDimensionsFromXml(field.ArrayDimensions));
+                                }
                             }
 
                             output.MaxStringLength = field.MaxStringLength;

diff --git a/Stack/Opc.Ua.Core/Stack/Generated/Opc.Ua.DataTypes.cs b/Stack/Opc.Ua.Core/Stack/Generated/Opc.Ua.DataTypes.cs
@@ -19211,8 +19211,8 @@ public enum TsnFailureCode
         InsufficientTrafficClassBandwidth = 3,
 
         /// <remarks />
-        [EnumMember(Value = "StreamIDInUse_4")]
-        StreamIDInUse = 4,
+        [EnumMember(Value = "StreamIdInUse_4")]
+        StreamIdInUse = 4,
 
         /// <remarks />
         [EnumMember(Value = "StreamDestinationAddressInUse_5")]
@@ -19227,28 +19227,28 @@ public enum TsnFailureCode
         LatencyHasChanged = 7,
 
         /// <remarks />
-        [EnumMember(Value = "EgressPortNotAVBCapable_8")]
-        EgressPortNotAVBCapable = 8,
+        [EnumMember(Value = "EgressPortNotAvbCapable_8")]
+        EgressPortNotAvbCapable = 8,
 
         /// <remarks />
         [EnumMember(Value = "UseDifferentDestinationAddress_9")]
         UseDifferentDestinationAddress = 9,
 
         /// <remarks />
-        [EnumMember(Value = "OutOfMSRPResources_10")]
-        OutOfMSRPResources = 10,
+        [EnumMember(Value = "OutOfMsrpResources_10")]
+        OutOfMsrpResources = 10,
 
         /// <remarks />
-        [EnumMember(Value = "OutOfMMRPResources_11")]
-        OutOfMMRPResources = 11,
+        [EnumMember(Value = "OutOfMmrpResources_11")]
+        OutOfMmrpResources = 11,
 
         /// <remarks />
         [EnumMember(Value = "CannotStoreDestinationAddress_12")]
         CannotStoreDestinationAddress = 12,
 
         /// <remarks />
-        [EnumMember(Value = "PriorityIsNoAnSRCLass_13")]
-        PriorityIsNoAnSRCLass = 13,
+        [EnumMember(Value = "PriorityIsNotAnSrcClass_13")]
+        PriorityIsNotAnSrcClass = 13,
 
         /// <remarks />
         [EnumMember(Value = "MaxFrameSizeTooLarge_14")]
@@ -19259,8 +19259,8 @@ public enum TsnFailureCode
         MaxFanInPortsLimitReached = 15,
 
         /// <remarks />
-        [EnumMember(Value = "FirstValueChangedForStreamID_16")]
-        FirstValueChangedForStreamID = 16,
+        [EnumMember(Value = "FirstValueChangedForStreamId_16")]
+        FirstValueChangedForStreamId = 16,
 
         /// <remarks />
         [EnumMember(Value = "VlanBlockedOnEgress_17")]
@@ -19283,16 +19283,16 @@ public enum TsnFailureCode
         MaxLatencyExceeded = 21,
 
         /// <remarks />
-        [EnumMember(Value = "BridgeDoesNotProvideNetworkID_22")]
-        BridgeDoesNotProvideNetworkID = 22,
+        [EnumMember(Value = "BridgeDoesNotProvideNetworkId_22")]
+        BridgeDoesNotProvideNetworkId = 22,
 
         /// <remarks />
         [EnumMember(Value = "StreamTransformNotSupported_23")]
         StreamTransformNotSupported = 23,
 
         /// <remarks />
-        [EnumMember(Value = "StreamIDTypeNotSupported_24")]
-        StreamIDTypeNotSupported = 24,
+        [EnumMember(Value = "StreamIdTypeNotSupported_24")]
+        StreamIdTypeNotSupported = 24,
 
         /// <remarks />
         [EnumMember(Value = "FeatureNotSupported_25")]

diff --git a/Stack/Opc.Ua.Core/Stack/Generated/Opc.Ua.PredefinedNodes.uanodes b/Stack/Opc.Ua.Core/Stack/Generated/Opc.Ua.PredefinedNodes.uanodes