Merge 1.05.03 release final (#2439)

Merge 1.05.03 release final using a helper branch to resolve the conflict with the preview

Co-authored-by: Randy Armstrong <randy.armstrong@opcfoundation.org>

Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.PredefinedNodes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -133,7 +133,7 @@
       <uax:NumericId>724</uax:NumericId>
       <uax:Value>
         <uax:Value>
-          <uax:DateTime>2023-07-15T00:00:00Z</uax:DateTime>
+          <uax:DateTime>2023-12-15T00:00:00Z</uax:DateTime>
         </uax:Value>
       </uax:Value>
       <uax:DataType>
@@ -332,6 +332,34 @@
       <uax:AccessLevel>1</uax:AccessLevel>
       <uax:UserAccessLevel>1</uax:UserAccessLevel>
     </DefaultAccessRestrictions>
+    <ModelVersion>
+      <uax:NodeClass>Variable_2</uax:NodeClass>
+      <uax:NodeId>
+        <uax:Identifier>ns=1;i=1756</uax:Identifier>
+      </uax:NodeId>
+      <uax:BrowseName>
+        <uax:NamespaceIndex>1</uax:NamespaceIndex>
+        <uax:Name>ModelVersion</uax:Name>
+      </uax:BrowseName>
+      <uax:ReferenceTypeId>
+        <uax:Identifier>i=46</uax:Identifier>
+      </uax:ReferenceTypeId>
+      <uax:TypeDefinitionId>
+        <uax:Identifier>i=68</uax:Identifier>
+      </uax:TypeDefinitionId>
+      <uax:NumericId>1756</uax:NumericId>
+      <uax:Value>
+        <uax:Value>
+          <uax:String>1.5.2</uax:String>
+        </uax:Value>
+      </uax:Value>
+      <uax:DataType>
+        <uax:Identifier>i=24263</uax:Identifier>
+      </uax:DataType>
+      <uax:ValueRank>-1</uax:ValueRank>
+      <uax:AccessLevel>1</uax:AccessLevel>
+      <uax:UserAccessLevel>1</uax:UserAccessLevel>
+    </ModelVersion>
   </OPCUAGDSNamespaceMetadata>
   <WellKnownRole_DiscoveryAdmin xmlns="http://opcfoundation.org/UA/GDS/">
     <uax:NodeClass>Object_1</uax:NodeClass>
@@ -13826,7 +13854,7 @@ c2QiDQogIHRhcmdldE5hbWVzcGFjZT0iaHR0cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBL0dEUy9U
 eXBlcy54c2QiDQogIGVsZW1lbnRGb3JtRGVmYXVsdD0icXVhbGlmaWVkIg0KPg0KICA8eHM6YW5u
 b3RhdGlvbj4NCiAgICA8eHM6YXBwaW5mbz4NCiAgICAgIDx1YTpNb2RlbCBNb2RlbFVyaT0iaHR0
 cDovL29wY2ZvdW5kYXRpb24ub3JnL1VBL0dEUy8iIFZlcnNpb249IjEuMDUuMDIiIFB1YmxpY2F0
-aW9uRGF0ZT0iMjAyMy0wNy0xNVQwMDowMDowMFoiIC8+DQogICAgPC94czphcHBpbmZvPg0KICA8
+aW9uRGF0ZT0iMjAyMy0xMi0xNVQwMDowMDowMFoiIC8+DQogICAgPC94czphcHBpbmZvPg0KICA8
 L3hzOmFubm90YXRpb24+DQogIA0KICA8eHM6aW1wb3J0IG5hbWVzcGFjZT0iaHR0cDovL29wY2Zv
 dW5kYXRpb24ub3JnL1VBLzIwMDgvMDIvVHlwZXMueHNkIiAvPg0KDQogIDx4czpjb21wbGV4VHlw
 ZSBuYW1lPSJBcHBsaWNhdGlvblJlY29yZERhdGFUeXBlIj4NCiAgICA8eHM6c2VxdWVuY2U+DQog

Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.bsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -37,7 +37,7 @@
 >
   <xs:annotation>
     <xs:appinfo>
-      <ua:Model ModelUri="http://opcfoundation.org/UA/GDS/" Version="1.05.02" PublicationDate="2023-07-15T00:00:00Z" />
+      <ua:Model ModelUri="http://opcfoundation.org/UA/GDS/" Version="1.05.02" PublicationDate="2023-12-15T00:00:00Z" />
     </xs:appinfo>
   </xs:annotation>
 

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

@@ -10,7 +10,7 @@ BadEncodingError,0x80060000,"Encoding halted because of invalid data in the obje
 BadDecodingError,0x80070000,"Decoding halted because of invalid data in the stream."
 BadEncodingLimitsExceeded,0x80080000,"The message encoding/decoding limits imposed by the stack have been exceeded."
 BadRequestTooLarge,0x80B80000,"The request message size exceeds limits set by the server."
-BadResponseTooLarge,0x80B90000,"The response message size exceeds limits set by the client."
+BadResponseTooLarge,0x80B90000,"The response message size exceeds limits set by the client or server."
 BadUnknownResponse,0x80090000,"An unrecognized response was received from the server."
 BadTimeout,0x800A0000,"The operation timed out."
 BadServiceUnsupported,0x800B0000,"The server does not support the requested service."
@@ -97,6 +97,7 @@ BadBrowseDirectionInvalid,0x804D0000,"The browse direction is not valid."
 BadNodeNotInView,0x804E0000,"The node is not part of the view."
 BadNumericOverflow,0x81120000,"The number was not accepted because of a numeric overflow."
 BadLocaleNotSupported,0x80ED0000,"The locale in the requested write operation is not supported."
+BadNoValue,0x80F00000,"The variable has no default value and no initial value."
 BadServerUriInvalid,0x804F0000,"The ServerUri is not a valid URI."
 BadServerNameMissing,0x80500000,"No ServerName was specified."
 BadDiscoveryUrlMissing,0x80510000,"No DiscoveryUrl was specified."

Stack/Opc.Ua.Core/Schema/Opc.Ua.Types.bsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -287,9 +287,9 @@
   <opc:StructuredType Name="BitFieldDefinition" BaseType="ua:ExtensionObject">
     <opc:Field Name="Name" TypeName="opc:String" />
     <opc:Field Name="Description" TypeName="ua:LocalizedText" />
-    <opc:Field Name="DataType" TypeName="ua:NodeId" />
+    <opc:Field Name="Reserved" TypeName="opc:Boolean" />
     <opc:Field Name="StartingBitPosition" TypeName="opc:UInt32" />
-    <opc:Field Name="NumberOfBits" TypeName="opc:UInt32" />
+    <opc:Field Name="EndingBitPosition" TypeName="opc:UInt32" />
   </opc:StructuredType>
 
   <opc:StructuredType Name="RationalNumber" BaseType="ua:ExtensionObject">

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -37,7 +37,7 @@
 >
   <xs:annotation>
     <xs:appinfo>
-      <ua:Model ModelUri="http://opcfoundation.org/UA/" Version="1.05.03" PublicationDate="2023-07-15T00:00:00Z" />
+      <ua:Model ModelUri="http://opcfoundation.org/UA/" Version="1.05.03" PublicationDate="2023-12-15T00:00:00Z" />
     </xs:appinfo>
   </xs:annotation>
 
@@ -630,9 +630,9 @@
     <xs:sequence>
       <xs:element name="Name" type="xs:string" minOccurs="0" nillable="true" />
       <xs:element name="Description" type="ua:LocalizedText" minOccurs="0" nillable="true" />
-      <xs:element name="DataType" type="ua:NodeId" minOccurs="0" nillable="true" />
+      <xs:element name="Reserved" type="xs:boolean" minOccurs="0" />
       <xs:element name="StartingBitPosition" type="xs:unsignedInt" minOccurs="0" />
-      <xs:element name="NumberOfBits" type="xs:unsignedInt" minOccurs="0" />
+      <xs:element name="EndingBitPosition" type="xs:unsignedInt" minOccurs="0" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="BitFieldDefinition" type="tns:BitFieldDefinition" />

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

@@ -245,7 +245,7 @@ public bool PublicationDateSpecified {
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType="token")]
+        [System.Xml.Serialization.XmlAttributeAttribute()]
         public string ModelVersion {
             get {
                 return this.modelVersionField;

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

@@ -177,9 +177,7 @@
   </xs:complexType>
 
   <xs:simpleType name="ModelVersion">
-    <xs:restriction base="xs:token">
-      <xs:pattern value="^(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*)(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$" />
-    </xs:restriction>
+    <xs:restriction base="xs:string" />
   </xs:simpleType>
 
   <xs:simpleType name="NodeId">

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2024 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  *