Modelcompiler 2021 11 24 (Fixes for MethodDeclarationId) (#1612)

- ModelCompiler Fixes for MethodDeclarationId
- Previous fix not only removed TypDefinitionId in certain cases but also removed the MethodDeclarationId
- This backward compatible fix should work with old and new nodeset files

Stack/Opc.Ua.Core/Schema/NodeIds.csv

@@ -8043,7 +8043,7 @@ DiscrepancyAlarmType_Tolerance,17217,Variable
 SafetyConditionClassType,17218,ObjectType
 HighlyManagedAlarmConditionClassType,17219,ObjectType
 TrainingConditionClassType,17220,ObjectType
-TestingConditionSubClassType,17221,ObjectType
+TestingConditionClassType,17221,ObjectType
 AuditConditionCommentEventType_ConditionEventId,17222,Variable
 AuditConditionAcknowledgeEventType_ConditionEventId,17223,Variable
 AuditConditionConfirmEventType_ConditionEventId,17224,Variable

Stack/Opc.Ua.Core/Schema/UANodeSet.cs

@@ -151,16 +151,18 @@ public partial class ModelTableEntry {
 
         private string modelUriField;
 
+        private string xmlSchemaUriField;
+
         private string versionField;
 
         private System.DateTime publicationDateField;
 
         private bool publicationDateFieldSpecified;
 
-        private byte accessRestrictionsField;
+        private ushort accessRestrictionsField;
 
         public ModelTableEntry() {
-            this.accessRestrictionsField = ((byte)(0));
+            this.accessRestrictionsField = ((ushort)(0));
         }
 
         /// <remarks/>
@@ -196,6 +198,17 @@ public partial class ModelTableEntry {
             }
         }
 
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string XmlSchemaUri {
+            get {
+                return this.xmlSchemaUriField;
+            }
+            set {
+                this.xmlSchemaUriField = value;
+            }
+        }
+
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string Version {
@@ -231,8 +244,8 @@ public partial class ModelTableEntry {
 
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute(typeof(byte), "0")]
-        public byte AccessRestrictions {
+        [System.ComponentModel.DefaultValueAttribute(typeof(ushort), "0")]
+        public ushort AccessRestrictions {
             get {
                 return this.accessRestrictionsField;
             }
@@ -918,7 +931,7 @@ public partial class UANode {
 
         private uint userWriteMaskField;
 
-        private byte accessRestrictionsField;
+        private ushort accessRestrictionsField;
 
         private bool accessRestrictionsFieldSpecified;
 
@@ -1059,7 +1072,7 @@ public partial class UANode {
 
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public byte AccessRestrictions {
+        public ushort AccessRestrictions {
             get {
                 return this.accessRestrictionsField;
             }

Stack/Opc.Ua.Core/Schema/UANodeSet.xsd

@@ -157,6 +157,7 @@
       <xs:element name="RequiredModel" type="ModelTableEntry" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
     <xs:attribute name="ModelUri" type="xs:string" use="required" />
+    <xs:attribute name="XmlSchemaUri" type="xs:string" use="optional" />
     <xs:attribute name="Version" type="xs:string" />
     <xs:attribute name="PublicationDate" type="xs:dateTime" />
     <xs:attribute name="AccessRestrictions" type="AccessRestriction" default="0" />
@@ -215,7 +216,7 @@
   </xs:simpleType>
 
   <xs:simpleType name="AccessRestriction">
-    <xs:restriction base="xs:unsignedByte" />
+    <xs:restriction base="xs:unsignedShort" />
   </xs:simpleType>
 
   <xs:simpleType name="ArrayDimensions">

Stack/Opc.Ua.Core/Stack/Generated/Opc.Ua.Constants.cs

@@ -11380,9 +11380,9 @@ public static partial class ObjectTypes
         public const uint StatisticalConditionClassType = 18665;
 
         /// <summary>
-        /// The identifier for the TestingConditionSubClassType ObjectType.
+        /// The identifier for the TestingConditionClassType ObjectType.
         /// </summary>
-        public const uint TestingConditionSubClassType = 17221;
+        public const uint TestingConditionClassType = 17221;
 
         /// <summary>
         /// The identifier for the AuditConditionEventType ObjectType.
@@ -47600,9 +47600,9 @@ public static partial class ObjectTypeIds
         public static readonly NodeId StatisticalConditionClassType = new NodeId(Opc.Ua.ObjectTypes.StatisticalConditionClassType);
 
         /// <summary>
-        /// The identifier for the TestingConditionSubClassType ObjectType.
+        /// The identifier for the TestingConditionClassType ObjectType.
         /// </summary>
-        public static readonly NodeId TestingConditionSubClassType = new NodeId(Opc.Ua.ObjectTypes.TestingConditionSubClassType);
+        public static readonly NodeId TestingConditionClassType = new NodeId(Opc.Ua.ObjectTypes.TestingConditionClassType);
 
         /// <summary>
         /// The identifier for the AuditConditionEventType ObjectType.
@@ -79289,9 +79289,9 @@ public static partial class BrowseNames
         public const string TemporaryFileTransferType = "TemporaryFileTransferType";
 
         /// <summary>
-        /// The BrowseName for the TestingConditionSubClassType component.
+        /// The BrowseName for the TestingConditionClassType component.
         /// </summary>
-        public const string TestingConditionSubClassType = "TestingConditionSubClassType";
+        public const string TestingConditionClassType = "TestingConditionClassType";
 
         /// <summary>
         /// The BrowseName for the ThreeDCartesianCoordinates component.