diff --git a/Samples/Controls.Net4/Common/PerformanceTestDlg.cs b/Samples/Controls.Net4/Common/PerformanceTestDlg.cs index 2bc4c1b98..1940a3424 100644 --- a/Samples/Controls.Net4/Common/PerformanceTestDlg.cs +++ b/Samples/Controls.Net4/Common/PerformanceTestDlg.cs @@ -512,7 +512,7 @@ private void TestAllBTN_Click(object sender, EventArgs e) /// The result of a performance test. /// [DataType] - public partial class PerformanceTestResult + public sealed partial class PerformanceTestResult { #region Constructors /// @@ -623,7 +623,7 @@ public IDictionary Results /// The result of a performance test. /// [DataType] - public partial class PerformanceTestResultItem + public sealed partial class PerformanceTestResultItem { #region Constructors /// diff --git a/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferConfiguration.cs b/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferConfiguration.cs index bac54eced..8d14cd173 100644 --- a/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferConfiguration.cs +++ b/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferConfiguration.cs @@ -28,7 +28,6 @@ * ======================================================================*/ using System; -using System.Runtime.Serialization; using System.Collections.Generic; using Opc.Ua.Server; @@ -41,7 +40,7 @@ namespace MemoryBuffer /// // Namespaces.MemoryBuffer is generated in the same pass and is unavailable to the [DataType] generator. [DataType(Namespace = "http://samples.org/UA/MemoryBuffer")] - public partial class MemoryBufferConfiguration + public sealed partial class MemoryBufferConfiguration { #region Constructors /// @@ -52,15 +51,6 @@ public MemoryBufferConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// @@ -92,7 +82,7 @@ public ArrayOf Buffers /// // Namespaces.MemoryBuffer is generated in the same pass and is unavailable to the [DataType] generator. [DataType(Namespace = "http://samples.org/UA/MemoryBuffer")] - public partial class MemoryBufferInstance + public sealed partial class MemoryBufferInstance { #region Constructors /// @@ -103,15 +93,6 @@ public MemoryBufferInstance() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Samples/Opc.Ua.Sample/TestData/TestDataNodeManagerConfiguration.cs b/Samples/Opc.Ua.Sample/TestData/TestDataNodeManagerConfiguration.cs index a7aedaac4..8c8796f7e 100644 --- a/Samples/Opc.Ua.Sample/TestData/TestDataNodeManagerConfiguration.cs +++ b/Samples/Opc.Ua.Sample/TestData/TestDataNodeManagerConfiguration.cs @@ -27,7 +27,6 @@ * http://opcfoundation.org/License/MIT/1.00/ * ======================================================================*/ -using System.Runtime.Serialization; using Opc.Ua; namespace TestData @@ -36,7 +35,7 @@ namespace TestData /// Stores the configuration the test node manager /// [DataType] - public partial class TestDataNodeManagerConfiguration + public sealed partial class TestDataNodeManagerConfiguration { #region Constructors /// @@ -47,15 +46,6 @@ public TestDataNodeManagerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/Aggregation/Server/AggregationServerConfiguration.cs b/Workshop/Aggregation/Server/AggregationServerConfiguration.cs index 336fe49ca..81df00c8b 100644 --- a/Workshop/Aggregation/Server/AggregationServerConfiguration.cs +++ b/Workshop/Aggregation/Server/AggregationServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace AggregationServer @@ -38,8 +37,8 @@ namespace AggregationServer /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.Aggregation)] - public class AggregationServerConfiguration + [DataType(Namespace = Namespaces.Aggregation)] + public sealed partial class AggregationServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public AggregationServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/AlarmCondition/Server/AlarmConditionServerConfiguration.cs b/Workshop/AlarmCondition/Server/AlarmConditionServerConfiguration.cs index 6888ca251..982afe16e 100644 --- a/Workshop/AlarmCondition/Server/AlarmConditionServerConfiguration.cs +++ b/Workshop/AlarmCondition/Server/AlarmConditionServerConfiguration.cs @@ -29,7 +29,6 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; using Opc.Ua; namespace Quickstarts.AlarmConditionServer @@ -38,7 +37,7 @@ namespace Quickstarts.AlarmConditionServer /// Stores the configuration the Alarm Condition server. /// [DataType(Namespace = "http://opcfoundation.org/Quickstarts/AlarmCondition")] - public partial class AlarmConditionServerConfiguration + public sealed partial class AlarmConditionServerConfiguration { #region Public Properties @@ -62,7 +61,7 @@ public ArrayOf Areas /// Stores the configuration for a Area within the Alarm Condition server. /// [DataType(Namespace = "http://opcfoundation.org/Quickstarts/AlarmCondition")] - public partial class AreaConfiguration + public sealed partial class AreaConfiguration { #region Public Properties diff --git a/Workshop/Boiler/Server/Boiler Server.csproj b/Workshop/Boiler/Server/Boiler Server.csproj index 52f3323a3..f1dbd5d6d 100644 --- a/Workshop/Boiler/Server/Boiler Server.csproj +++ b/Workshop/Boiler/Server/Boiler Server.csproj @@ -39,5 +39,11 @@ 2.0.0-preview.2 + + diff --git a/Workshop/Boiler/Server/BoilerNodeManager.cs b/Workshop/Boiler/Server/BoilerNodeManager.cs index 99d4d01ff..3aca6b9d8 100644 --- a/Workshop/Boiler/Server/BoilerNodeManager.cs +++ b/Workshop/Boiler/Server/BoilerNodeManager.cs @@ -63,7 +63,7 @@ public BoilerNodeManager(IServerInternal server, ApplicationConfiguration config SetNamespaces(namespaceUrls); // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/Boiler/Server/BoilerServerConfiguration.cs b/Workshop/Boiler/Server/BoilerServerConfiguration.cs index f4b8d5c27..761b2ebc8 100644 --- a/Workshop/Boiler/Server/BoilerServerConfiguration.cs +++ b/Workshop/Boiler/Server/BoilerServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.Boiler.Server @@ -38,8 +37,8 @@ namespace Quickstarts.Boiler.Server /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.Boiler)] - public class BoilerServerConfiguration + [DataType(Namespace = Namespaces.Boiler)] + public sealed partial class BoilerServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public BoilerServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/DataAccess/Server/DataAccess Server.csproj b/Workshop/DataAccess/Server/DataAccess Server.csproj index b53bab0e3..cef58fb5d 100644 --- a/Workshop/DataAccess/Server/DataAccess Server.csproj +++ b/Workshop/DataAccess/Server/DataAccess Server.csproj @@ -36,5 +36,11 @@ 2.0.0-preview.2 + + diff --git a/Workshop/DataAccess/Server/DataAccessNodeManager.cs b/Workshop/DataAccess/Server/DataAccessNodeManager.cs index 33fb7a995..6f2e2e446 100644 --- a/Workshop/DataAccess/Server/DataAccessNodeManager.cs +++ b/Workshop/DataAccess/Server/DataAccessNodeManager.cs @@ -59,7 +59,7 @@ public DataAccessServerNodeManager(IServerInternal server, ApplicationConfigurat SystemContext.NodeIdFactory = this; // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/DataAccess/Server/DataAccessServerConfiguration.cs b/Workshop/DataAccess/Server/DataAccessServerConfiguration.cs index 9c7eda4df..0a34954df 100644 --- a/Workshop/DataAccess/Server/DataAccessServerConfiguration.cs +++ b/Workshop/DataAccess/Server/DataAccessServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.DataAccessServer @@ -38,8 +37,8 @@ namespace Quickstarts.DataAccessServer /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.DataAccess)] - public class DataAccessServerConfiguration + [DataType(Namespace = Namespaces.DataAccess)] + public sealed partial class DataAccessServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public DataAccessServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/DataTypes/Server/DataTypes Server.csproj b/Workshop/DataTypes/Server/DataTypes Server.csproj index 0aaa95b9f..5d5ea790b 100644 --- a/Workshop/DataTypes/Server/DataTypes Server.csproj +++ b/Workshop/DataTypes/Server/DataTypes Server.csproj @@ -40,5 +40,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/DataTypes/Server/DataTypesNodeManager.cs b/Workshop/DataTypes/Server/DataTypesNodeManager.cs index 8e14252fc..bdea617a5 100644 --- a/Workshop/DataTypes/Server/DataTypesNodeManager.cs +++ b/Workshop/DataTypes/Server/DataTypesNodeManager.cs @@ -61,7 +61,7 @@ public DataTypesNodeManager(IServerInternal server, ApplicationConfiguration con Quickstarts.DataTypes.Instances.Namespaces.DataTypeInstances); // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/DataTypes/Server/DataTypesServer.Config.xml b/Workshop/DataTypes/Server/DataTypesServer.Config.xml index 86d862b8e..ac9383554 100644 --- a/Workshop/DataTypes/Server/DataTypesServer.Config.xml +++ b/Workshop/DataTypes/Server/DataTypesServer.Config.xml @@ -133,7 +133,7 @@ - + diff --git a/Workshop/DataTypes/Server/DataTypesServerConfiguration.cs b/Workshop/DataTypes/Server/DataTypesServerConfiguration.cs index afd277519..24a1407f3 100644 --- a/Workshop/DataTypes/Server/DataTypesServerConfiguration.cs +++ b/Workshop/DataTypes/Server/DataTypesServerConfiguration.cs @@ -28,8 +28,8 @@ * ======================================================================*/ using System; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.DataTypes @@ -37,8 +37,8 @@ namespace Quickstarts.DataTypes /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.DataTypes)] - public class DataTypesServerConfiguration + [DataType(Namespace = Namespaces.DataTypes)] + public sealed partial class DataTypesServerConfiguration { #region Constructors /// @@ -49,15 +49,6 @@ public DataTypesServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/Empty/Server/Empty Server.csproj b/Workshop/Empty/Server/Empty Server.csproj index fe1395298..138784867 100644 --- a/Workshop/Empty/Server/Empty Server.csproj +++ b/Workshop/Empty/Server/Empty Server.csproj @@ -33,5 +33,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/Empty/Server/EmptyNodeManager.cs b/Workshop/Empty/Server/EmptyNodeManager.cs index d6147555d..8a138a624 100644 --- a/Workshop/Empty/Server/EmptyNodeManager.cs +++ b/Workshop/Empty/Server/EmptyNodeManager.cs @@ -56,7 +56,7 @@ public EmptyNodeManager(IServerInternal server, ApplicationConfiguration configu SystemContext.NodeIdFactory = this; // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/Empty/Server/EmptyServerConfiguration.cs b/Workshop/Empty/Server/EmptyServerConfiguration.cs index 3bf4bee51..49e1d9f32 100644 --- a/Workshop/Empty/Server/EmptyServerConfiguration.cs +++ b/Workshop/Empty/Server/EmptyServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.EmptyServer @@ -38,8 +37,8 @@ namespace Quickstarts.EmptyServer /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.Empty)] - public class EmptyServerConfiguration + [DataType(Namespace = Namespaces.Empty)] + public sealed partial class EmptyServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public EmptyServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj index 6911bf496..c205c3ebd 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj +++ b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj @@ -61,6 +61,12 @@ 2.0.0-preview.2 + + diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccessNodeManager.cs b/Workshop/HistoricalAccess/Server/HistoricalAccessNodeManager.cs index f9652fbae..a7ced508a 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccessNodeManager.cs +++ b/Workshop/HistoricalAccess/Server/HistoricalAccessNodeManager.cs @@ -58,7 +58,7 @@ public HistoricalAccessServerNodeManager(IServerInternal server, ApplicationConf this.AliasRoot = "HDA"; // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccessServerConfiguration.cs b/Workshop/HistoricalAccess/Server/HistoricalAccessServerConfiguration.cs index e9bf44759..9d0508458 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccessServerConfiguration.cs +++ b/Workshop/HistoricalAccess/Server/HistoricalAccessServerConfiguration.cs @@ -28,8 +28,6 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; using Opc.Ua.Server; using Opc.Ua; @@ -39,8 +37,8 @@ namespace Quickstarts.HistoricalAccessServer /// /// Stores the configuration the data access node manager. /// - [DataType] - public partial class HistoricalAccessServerConfiguration + [DataType(Namespace = Namespaces.HistoricalAccess)] + public sealed partial class HistoricalAccessServerConfiguration { #region Constructors /// @@ -51,15 +49,6 @@ public HistoricalAccessServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj index 10146ed65..77abeb5c3 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj +++ b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj @@ -38,5 +38,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/HistoricalEvents/Server/HistoricalEventsNodeManager.cs b/Workshop/HistoricalEvents/Server/HistoricalEventsNodeManager.cs index e8619c3f8..3cf3617ab 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEventsNodeManager.cs +++ b/Workshop/HistoricalEvents/Server/HistoricalEventsNodeManager.cs @@ -63,7 +63,7 @@ public HistoricalEventsNodeManager(IServerInternal server, ApplicationConfigurat SetNamespaces(namespaceUrls); // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); m_logger = server.Telemetry.CreateLogger(); diff --git a/Workshop/HistoricalEvents/Server/HistoricalEventsServerConfiguration.cs b/Workshop/HistoricalEvents/Server/HistoricalEventsServerConfiguration.cs index ead558e9f..0a11f2989 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEventsServerConfiguration.cs +++ b/Workshop/HistoricalEvents/Server/HistoricalEventsServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.HistoricalEvents.Server @@ -38,8 +37,8 @@ namespace Quickstarts.HistoricalEvents.Server /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.HistoricalEvents)] - public class HistoricalEventsServerConfiguration + [DataType(Namespace = Namespaces.HistoricalEvents)] + public sealed partial class HistoricalEventsServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public HistoricalEventsServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/Methods/Server/Methods Server.csproj b/Workshop/Methods/Server/Methods Server.csproj index 34edcf3ef..e6b9e494d 100644 --- a/Workshop/Methods/Server/Methods Server.csproj +++ b/Workshop/Methods/Server/Methods Server.csproj @@ -33,5 +33,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/Methods/Server/MethodsNodeManager.cs b/Workshop/Methods/Server/MethodsNodeManager.cs index 899f604ff..230c49882 100644 --- a/Workshop/Methods/Server/MethodsNodeManager.cs +++ b/Workshop/Methods/Server/MethodsNodeManager.cs @@ -80,7 +80,7 @@ public MethodsNodeManager(IServerInternal server, ApplicationConfiguration confi SystemContext.NodeIdFactory = this; // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/Methods/Server/MethodsServerConfiguration.cs b/Workshop/Methods/Server/MethodsServerConfiguration.cs index 1042ee4c3..163ab5fcd 100644 --- a/Workshop/Methods/Server/MethodsServerConfiguration.cs +++ b/Workshop/Methods/Server/MethodsServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.MethodsServer @@ -38,8 +37,8 @@ namespace Quickstarts.MethodsServer /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.Methods)] - public class MethodsServerConfiguration + [DataType(Namespace = Namespaces.Methods)] + public sealed partial class MethodsServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public MethodsServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/PerfTest/Server/PerfTest Server.csproj b/Workshop/PerfTest/Server/PerfTest Server.csproj index 63570114b..472c16665 100644 --- a/Workshop/PerfTest/Server/PerfTest Server.csproj +++ b/Workshop/PerfTest/Server/PerfTest Server.csproj @@ -33,5 +33,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/PerfTest/Server/PerfTestNodeManager.cs b/Workshop/PerfTest/Server/PerfTestNodeManager.cs index 020e551e6..292649401 100644 --- a/Workshop/PerfTest/Server/PerfTestNodeManager.cs +++ b/Workshop/PerfTest/Server/PerfTestNodeManager.cs @@ -57,7 +57,7 @@ public PerfTestNodeManager(IServerInternal server, ApplicationConfiguration conf SystemContext.SystemHandle = m_system = new UnderlyingSystem(); // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/PerfTest/Server/PerfTestServerConfiguration.cs b/Workshop/PerfTest/Server/PerfTestServerConfiguration.cs index e2814342c..597a8e821 100644 --- a/Workshop/PerfTest/Server/PerfTestServerConfiguration.cs +++ b/Workshop/PerfTest/Server/PerfTestServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.PerfTestServer @@ -38,8 +37,8 @@ namespace Quickstarts.PerfTestServer /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.PerfTest)] - public class PerfTestServerConfiguration + [DataType(Namespace = Namespaces.PerfTest)] + public sealed partial class PerfTestServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public PerfTestServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj index 33d5b7a85..99db4527d 100644 --- a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj +++ b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj @@ -37,5 +37,11 @@ 2.0.0-preview.2 + + \ No newline at end of file diff --git a/Workshop/SimpleEvents/Server/SimpleEventsNodeManager.cs b/Workshop/SimpleEvents/Server/SimpleEventsNodeManager.cs index a140a4849..de3c8a5ce 100644 --- a/Workshop/SimpleEvents/Server/SimpleEventsNodeManager.cs +++ b/Workshop/SimpleEvents/Server/SimpleEventsNodeManager.cs @@ -62,7 +62,7 @@ public SimpleEventsNodeManager(IServerInternal server, ApplicationConfiguration SetNamespaces(namespaceUrls); // get the configuration for the node manager. - m_configuration = null; + m_configuration = configuration.ParseExtension(); // use suitable defaults if no configuration exists. if (m_configuration == null) diff --git a/Workshop/SimpleEvents/Server/SimpleEventsServerConfiguration.cs b/Workshop/SimpleEvents/Server/SimpleEventsServerConfiguration.cs index 389d2c16b..590168c5c 100644 --- a/Workshop/SimpleEvents/Server/SimpleEventsServerConfiguration.cs +++ b/Workshop/SimpleEvents/Server/SimpleEventsServerConfiguration.cs @@ -28,9 +28,8 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; +using Opc.Ua; using Opc.Ua.Server; namespace Quickstarts.SimpleEvents.Server @@ -38,8 +37,8 @@ namespace Quickstarts.SimpleEvents.Server /// /// Stores the configuration the data access node manager. /// - [DataContract(Namespace = Namespaces.SimpleEvents)] - public class SimpleEventsServerConfiguration + [DataType(Namespace = Namespaces.SimpleEvents)] + public sealed partial class SimpleEventsServerConfiguration { #region Constructors /// @@ -50,15 +49,6 @@ public SimpleEventsServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/UserAuthentication/Server/UserAuthenticationServerConfiguration.cs b/Workshop/UserAuthentication/Server/UserAuthenticationServerConfiguration.cs index 7bb95055e..db5b92c61 100644 --- a/Workshop/UserAuthentication/Server/UserAuthenticationServerConfiguration.cs +++ b/Workshop/UserAuthentication/Server/UserAuthenticationServerConfiguration.cs @@ -28,8 +28,6 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; using Opc.Ua; using Opc.Ua.Server; @@ -40,7 +38,7 @@ namespace Quickstarts.UserAuthenticationServer /// Stores the configuration the data access node manager. /// [DataType(Namespace = "http://opcfoundation.org/Quickstarts/UserAuthentication")] - public partial class UserAuthenticationServerConfiguration + public sealed partial class UserAuthenticationServerConfiguration { #region Constructors /// @@ -51,15 +49,6 @@ public UserAuthenticationServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. /// diff --git a/Workshop/Views/Server/ViewsServerConfiguration.cs b/Workshop/Views/Server/ViewsServerConfiguration.cs index cae444c35..ee741b51c 100644 --- a/Workshop/Views/Server/ViewsServerConfiguration.cs +++ b/Workshop/Views/Server/ViewsServerConfiguration.cs @@ -28,8 +28,6 @@ * ======================================================================*/ using System; -using System.ServiceModel; -using System.Runtime.Serialization; using System.Collections.Generic; using Opc.Ua; using Opc.Ua.Server; @@ -40,7 +38,7 @@ namespace Quickstarts.ViewsServer /// Stores the configuration the data access node manager. /// [DataType(Namespace = "http://opcfoundation.org/UA/Quickstarts/Views")] - public partial class ViewsServerConfiguration + public sealed partial class ViewsServerConfiguration { #region Constructors /// @@ -51,15 +49,6 @@ public ViewsServerConfiguration() Initialize(); } - /// - /// Initializes the object during deserialization. - /// - [OnDeserializing()] - private void Initialize(StreamingContext context) - { - Initialize(); - } - /// /// Sets private members to default values. ///