Updated to new version

technosoftware-gmbh · Oct 8, 2021 · 4a01eb8 · 4a01eb8
1 parent 09e13f5
commit 4a01eb8
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------------------------------------------------
+## OPC UA Solution .NET - 2.3.3
+
+### Changes
+- Updated to OPC UA Core 1.4.367.41
+
 -------------------------------------------------------------------------------------------------------------
 ## OPC UA Solution .NET - 2.3.2
 
@@ -21,6 +27,9 @@
   It is called after OnStartup(). You have to add it to the UaServerPlugin.cs
 - Removed UaApplicationInstance. You can use ApplicationInstance instead.
 
+### Fixed issues
+- Fixed parameter type of method "PropertyState CreatePropertyState(NodeState parent, ...)". It is now NodeState and was before BaseObjectState.
+
 -------------------------------------------------------------------------------------------------------------
 ## OPC UA Solution .NET - 2.2.0
 

diff --git a/examples/Base/SampleClient/SampleCompany.SampleClient.csproj b/examples/Base/SampleClient/SampleCompany.SampleClient.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Base/SampleServer/SampleCompany.SampleServer.csproj b/examples/Base/SampleServer/SampleCompany.SampleServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/BaseModel/SampleServer/SampleCompany.SampleServer.csproj b/examples/BaseModel/SampleServer/SampleCompany.SampleServer.csproj
@@ -35,8 +35,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/DataTypes/SampleServer/SampleCompany.SampleServer.csproj b/examples/DataTypes/SampleServer/SampleCompany.SampleServer.csproj
@@ -35,8 +35,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Empty/EmptyClient/EmptyCompany.EmptyClient.csproj b/examples/Empty/EmptyClient/EmptyCompany.EmptyClient.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Empty/EmptyServer/EmptyCompany.EmptyServer.csproj b/examples/Empty/EmptyServer/EmptyCompany.EmptyServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/HistoricalAccess/SampleServer/SampleCompany.SampleServer.csproj b/examples/HistoricalAccess/SampleServer/SampleCompany.SampleServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Reference/ReferenceServer/Technosoftware.ReferenceServer.csproj b/examples/Reference/ReferenceServer/Technosoftware.ReferenceServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/ReverseConnect/SampleServer/SampleCompany.SampleServer.csproj b/examples/ReverseConnect/SampleServer/SampleCompany.SampleServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SimpleEvents/SampleServer/SampleCompany.SampleServer.csproj b/examples/SimpleEvents/SampleServer/SampleCompany.SampleServer.csproj
@@ -35,8 +35,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Simulation/SampleClient/SampleCompany.SampleClient.csproj b/examples/Simulation/SampleClient/SampleCompany.SampleClient.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Simulation/SampleServer/SampleCompany.SampleServer.csproj b/examples/Simulation/SampleServer/SampleCompany.SampleServer.csproj
@@ -35,8 +35,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/UserAuthentication/SampleServer/SampleCompany.SampleServer.csproj b/examples/UserAuthentication/SampleServer/SampleCompany.SampleServer.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" Version="1.4.366.38" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.2" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.2" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="2.3.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="2.3.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/schema/ApplicationConfiguration.xsd b/schema/ApplicationConfiguration.xsd
@@ -7,7 +7,7 @@
     xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
 >
   <xs:import namespace="http://opcfoundation.org/UA/2008/02/Types.xsd" schemaLocation="./Opc.Ua.Types.xsd"/>
-  
+
   <xs:complexType name="ApplicationConfiguration">
     <xs:sequence>
       <xs:element name="ApplicationName" type="xs:string" />
@@ -57,15 +57,16 @@
       <xs:element name="TrustedUserCertificates" type="CertificateTrustList" minOccurs="0" />
       <xs:element name="HttpsIssuerCertificates" type="CertificateTrustList" minOccurs="0" />
       <xs:element name="TrustedHttpsCertificates" type="CertificateTrustList" minOccurs="0" />
+      <xs:element name="SuppressNonceValidationErrors" type="xs:boolean" minOccurs="0" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="ListOfTransportConfiguration">
     <xs:sequence>
       <xs:element name="TransportConfiguration" type="TransportConfiguration" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="TransportConfiguration">
     <xs:sequence>
       <xs:element name="UriScheme" type="xs:string" />
@@ -102,7 +103,7 @@
       <xs:element name="ServerSecurityPolicy" type="ServerSecurityPolicy" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="ServerSecurityPolicy">
     <xs:sequence>
       <xs:element name="SecurityMode" type="ua:MessageSecurityMode" minOccurs="0" />
@@ -123,7 +124,7 @@
       <xs:element name="Count" type="xs:int" minOccurs="0" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="ServerConfiguration">
     <xs:complexContent mixed="false">
       <xs:extension base="ServerBaseConfiguration">
@@ -159,11 +160,36 @@
           <xs:element name="SupportedPrivateKeyFormats" type="ua:ListOfString" minOccurs="0" nillable="true" />
           <xs:element name="MaxTrustListSize" type="xs:int" minOccurs="0" />
           <xs:element name="MultiCastDnsEnabled" type="xs:boolean" minOccurs="0" />
+          <xs:element name="ReverseConnect" type="ReverseConnectServerConfiguration" minOccurs="0" />
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
+  <xs:complexType name="ReverseConnectServerConfiguration">
+    <xs:sequence>
+      <xs:element name="Clients" type="ListOfReverseConnectClient" minOccurs="0" nillable="true" />
+      <xs:element name="ConnectInterval" type="xs:int" minOccurs="0" />
+      <xs:element name="ConnectTimeout" type="xs:int" minOccurs="0" />
+      <xs:element name="RejectTimeout" type="xs:int" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ListOfReverseConnectClient">
+    <xs:sequence>
+      <xs:element name="ReverseConnectClient" type="ReverseConnectClient" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ReverseConnectClient">
+    <xs:sequence>
+      <xs:element name="EndpointUrl" type="xs:string" minOccurs="0" nillable="true" />
+      <xs:element name="Timeout" type="xs:int" minOccurs="0" />
+      <xs:element name="MaxSessionCount" type="xs:int" minOccurs="0" />
+      <xs:element name="Enabled" type="xs:boolean" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="DiscoveryServerConfiguration">
     <xs:complexContent mixed="false">
       <xs:extension base="ServerBaseConfiguration">
@@ -175,38 +201,59 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="ListOfServerRegistration">
     <xs:sequence>
       <xs:element name="ServerRegistration" type="ServerRegistration" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="ServerRegistration">
     <xs:sequence>
       <xs:element name="ApplicationUri" type="xs:string" minOccurs="0" />
       <xs:element name="AlternateDiscoveryUrls" type="ua:ListOfString" minOccurs="0" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="ClientConfiguration">
     <xs:sequence>
       <xs:element name="DefaultSessionTimeout" type="xs:int" minOccurs="0" />
       <xs:element name="WellKnownDiscoveryUrls" type="ua:ListOfString" minOccurs="0" />
       <xs:element name="DiscoveryServers" type="ua:ListOfEndpointDescription" minOccurs="0" />
       <xs:element name="EndpointCacheFilePath" type="xs:string" minOccurs="0" nillable="true" />
       <xs:element name="MinSubscriptionLifetime" type="xs:int" minOccurs="0" />
+      <xs:element name="ReverseConnect" type="ReverseConnectClientConfiguration" minOccurs="0" />	  
     </xs:sequence>
   </xs:complexType>
-
+
+  <xs:complexType name="ReverseConnectClientConfiguration">
+    <xs:sequence>
+      <xs:element name="ClientEndpoints" type="ListOfReverseConnectClientEndpoint" minOccurs="0" nillable="true" />
+      <xs:element name="HoldTime" type="xs:int" minOccurs="0" />
+      <xs:element name="WaitTimeout" type="xs:int" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ListOfReverseConnectClientEndpoint">
+    <xs:sequence>
+      <xs:element name="ClientEndpoint" type="ReverseConnectClientEndpoint" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ReverseConnectClientEndpoint">
+    <xs:sequence>
+      <xs:element name="EndpointUrl" type="xs:string" minOccurs="0" nillable="true" />
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="TraceConfiguration">
     <xs:sequence>
       <xs:element name="OutputFilePath" type="xs:string" minOccurs="0" nillable="true" />
       <xs:element name="DeleteOnLoad" type="xs:boolean" minOccurs="0" />
       <xs:element name="TraceMasks" type="xs:int" minOccurs="0" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="CertificateIdentifier">
     <xs:sequence>
       <xs:element name="StoreType" type="xs:string" minOccurs="0" />
@@ -231,7 +278,7 @@
       <xs:element name="CertificateIdentifier" type="CertificateIdentifier"  minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="CertificateStoreIdentifier">
     <xs:sequence>
       <xs:element name="StoreType" type="xs:string" minOccurs="0" />
@@ -247,7 +294,7 @@
       </xs:element>
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="CertificateTrustList">
     <xs:complexContent mixed="false">
       <xs:extension base="CertificateStoreIdentifier">
@@ -282,6 +329,7 @@
       <xs:element name="SelectedUserTokenPolicy" type="xs:int" minOccurs="0" />
       <xs:element name="UserIdentity" type="ua:UserIdentityToken" minOccurs="0" />
       <xs:element name="ComIdentity" type="EndpointComIdentity" minOccurs="0" />
+	    <xs:element name="ReverseConnect" type="ReverseConnectEndpoint" minOccurs="0" />
       <xs:element name="Extensions" type="ua:ListOfXmlElement" minOccurs="0"  />
     </xs:sequence>
   </xs:complexType>
@@ -294,6 +342,14 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:complexType name="ReverseConnectEndpoint">
+    <xs:sequence>
+      <xs:element name="Enabled" type="xs:boolean" minOccurs="0" />
+      <xs:element name="ServerUri" type="xs:string" minOccurs="0" />
+      <xs:element name="Thumbprint" type="xs:string" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="EndpointComIdentity">
     <xs:sequence>
       <xs:element name="Clsid" type="ua:Guid" minOccurs="0" />

diff --git a/schema/SecuredApplication.xsd b/schema/SecuredApplication.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

diff --git a/schema/UAModelDesign.xsd b/schema/UAModelDesign.xsd
@@ -316,6 +316,7 @@
     <xs:attribute name="NotInAddressSpace" type="xs:boolean" use="optional" default="false" />
     <xs:attribute name="ReleaseStatus" type="ReleaseStatus" use="optional" default="Released" />
     <xs:attribute name="Purpose" type="DataTypePurpose" use="optional" default="Normal" />
+    <xs:attribute name="IsDynamic" type="xs:boolean" use="optional" default="false" />
 
   </xs:complexType>
 
@@ -426,6 +427,7 @@
           <xs:element name="Encodings" type="ListOfEncodings" minOccurs="0" />
         </xs:sequence>
         <xs:attribute name="IsOptionSet" type="xs:boolean" use="optional" default="false" />
+        <xs:attribute name="IsUnion" type="xs:boolean" use="optional" default="false" />
         <xs:attribute name="NoArraysAllowed" type="xs:boolean" use="optional" default="false" />
       </xs:extension>
     </xs:complexContent>
@@ -648,6 +650,8 @@
     <xs:attribute name="DataType" type="xs:QName" use="optional" />
     <xs:attribute name="ValueRank" type="ValueRank" use="optional" default="Scalar" />
     <xs:attribute name="ArrayDimensions" type="xs:string" use="optional" />
+    <xs:attribute name="AllowSubtypes" type="xs:boolean" use="optional" default="false" />
+    <xs:attribute name="IsOptional" type="xs:boolean" use="optional" default="false" />
   </xs:complexType>
 
   <xs:complexType name="ListOfArguments">
@@ -699,6 +703,9 @@
       <xs:enumeration value="Read" />
       <xs:enumeration value="Write" />
       <xs:enumeration value="ReadWrite" />
+      <xs:enumeration value="HistoryRead" />
+      <xs:enumeration value="HistoryWrite" />
+      <xs:enumeration value="HistoryReadWrite" />
     </xs:restriction>
   </xs:simpleType>