Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Samples/Controls.Net4/Common/PerformanceTestDlg.cs
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ private void TestAllBTN_Click(object sender, EventArgs e)
/// The result of a performance test.
/// </summary>
[DataType]
public partial class PerformanceTestResult
public sealed partial class PerformanceTestResult
{
#region Constructors
/// <summary>
Expand Down Expand Up @@ -623,7 +623,7 @@ public IDictionary<int, double> Results
/// The result of a performance test.
/// </summary>
[DataType]
public partial class PerformanceTestResultItem
public sealed partial class PerformanceTestResultItem
{
#region Constructors
/// <summary>
Expand Down
23 changes: 2 additions & 21 deletions Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* ======================================================================*/

using System;
using System.Runtime.Serialization;
using System.Collections.Generic;

using Opc.Ua.Server;
Expand All @@ -41,7 +40,7 @@ namespace MemoryBuffer
/// </summary>
// 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
/// <summary>
Expand All @@ -52,15 +51,6 @@ public MemoryBufferConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down Expand Up @@ -92,7 +82,7 @@ public ArrayOf<MemoryBufferInstance> Buffers
/// </summary>
// 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
/// <summary>
Expand All @@ -103,15 +93,6 @@ public MemoryBufferInstance()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
* http://opcfoundation.org/License/MIT/1.00/
* ======================================================================*/

using System.Runtime.Serialization;
using Opc.Ua;

namespace TestData
Expand All @@ -36,7 +35,7 @@ namespace TestData
/// Stores the configuration the test node manager
/// </summary>
[DataType]
public partial class TestDataNodeManagerConfiguration
public sealed partial class TestDataNodeManagerConfiguration
{
#region Constructors
/// <summary>
Expand All @@ -47,15 +46,6 @@ public TestDataNodeManagerConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
16 changes: 3 additions & 13 deletions Workshop/Aggregation/Server/AggregationServerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@
* ======================================================================*/

using System;
using System.ServiceModel;
using System.Runtime.Serialization;
using System.Collections.Generic;
using Opc.Ua;
using Opc.Ua.Server;

namespace AggregationServer
{
/// <summary>
/// Stores the configuration the data access node manager.
/// </summary>
[DataContract(Namespace = Namespaces.Aggregation)]
public class AggregationServerConfiguration
[DataType(Namespace = Namespaces.Aggregation)]
public sealed partial class AggregationServerConfiguration
{
#region Constructors
/// <summary>
Expand All @@ -50,15 +49,6 @@ public AggregationServerConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using Opc.Ua;

namespace Quickstarts.AlarmConditionServer
Expand All @@ -38,7 +37,7 @@ namespace Quickstarts.AlarmConditionServer
/// Stores the configuration the Alarm Condition server.
/// </summary>
[DataType(Namespace = "http://opcfoundation.org/Quickstarts/AlarmCondition")]
public partial class AlarmConditionServerConfiguration
public sealed partial class AlarmConditionServerConfiguration
{

#region Public Properties
Expand All @@ -62,7 +61,7 @@ public ArrayOf<AreaConfiguration> Areas
/// Stores the configuration for a Area within the Alarm Condition server.
/// </summary>
[DataType(Namespace = "http://opcfoundation.org/Quickstarts/AlarmCondition")]
public partial class AreaConfiguration
public sealed partial class AreaConfiguration
{

#region Public Properties
Expand Down
6 changes: 6 additions & 0 deletions Workshop/Boiler/Server/Boiler Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,11 @@
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>2.0.0-preview.2</Version>
</PackageReference>

<PackageReference
Include="OPCFoundation.NetStandard.Opc.Ua.SourceGeneration"
Version="2.0.0-preview.2"
OutputItemType="Analyzer"
ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Workshop/Boiler/Server/BoilerNodeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<BoilerServerConfiguration>();

// use suitable defaults if no configuration exists.
if (m_configuration == null)
Expand Down
16 changes: 3 additions & 13 deletions Workshop/Boiler/Server/BoilerServerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@
* ======================================================================*/

using System;
using System.ServiceModel;
using System.Runtime.Serialization;
using System.Collections.Generic;
using Opc.Ua;
using Opc.Ua.Server;

namespace Quickstarts.Boiler.Server
{
/// <summary>
/// Stores the configuration the data access node manager.
/// </summary>
[DataContract(Namespace = Namespaces.Boiler)]
public class BoilerServerConfiguration
[DataType(Namespace = Namespaces.Boiler)]
public sealed partial class BoilerServerConfiguration
{
#region Constructors
/// <summary>
Expand All @@ -50,15 +49,6 @@ public BoilerServerConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions Workshop/DataAccess/Server/DataAccess Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,11 @@
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>2.0.0-preview.2</Version>
</PackageReference>

<PackageReference
Include="OPCFoundation.NetStandard.Opc.Ua.SourceGeneration"
Version="2.0.0-preview.2"
OutputItemType="Analyzer"
ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Workshop/DataAccess/Server/DataAccessNodeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<DataAccessServerConfiguration>();

// use suitable defaults if no configuration exists.
if (m_configuration == null)
Expand Down
16 changes: 3 additions & 13 deletions Workshop/DataAccess/Server/DataAccessServerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@
* ======================================================================*/

using System;
using System.ServiceModel;
using System.Runtime.Serialization;
using System.Collections.Generic;
using Opc.Ua;
using Opc.Ua.Server;

namespace Quickstarts.DataAccessServer
{
/// <summary>
/// Stores the configuration the data access node manager.
/// </summary>
[DataContract(Namespace = Namespaces.DataAccess)]
public class DataAccessServerConfiguration
[DataType(Namespace = Namespaces.DataAccess)]
public sealed partial class DataAccessServerConfiguration
{
#region Constructors
/// <summary>
Expand All @@ -50,15 +49,6 @@ public DataAccessServerConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions Workshop/DataTypes/Server/DataTypes Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,11 @@
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>2.0.0-preview.2</Version>
</PackageReference>

<PackageReference
Include="OPCFoundation.NetStandard.Opc.Ua.SourceGeneration"
Version="2.0.0-preview.2"
OutputItemType="Analyzer"
ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Workshop/DataTypes/Server/DataTypesNodeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<DataTypesServerConfiguration>();

// use suitable defaults if no configuration exists.
if (m_configuration == null)
Expand Down
2 changes: 1 addition & 1 deletion Workshop/DataTypes/Server/DataTypesServer.Config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@

<Extensions>
<ua:XmlElement>
<DataTypesServerConfiguration xmlns="http://somecompany.com/DataTypes">
<DataTypesServerConfiguration xmlns="urn:localhost:somecompany.com:DataTypesServer">
</DataTypesServerConfiguration>
</ua:XmlElement>
</Extensions>
Expand Down
15 changes: 3 additions & 12 deletions Workshop/DataTypes/Server/DataTypesServerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
* ======================================================================*/

using System;
using System.Runtime.Serialization;
using System.Collections.Generic;
using Opc.Ua;
using Opc.Ua.Server;

namespace Quickstarts.DataTypes
{
/// <summary>
/// Stores the configuration the data access node manager.
/// </summary>
[DataContract(Namespace = Namespaces.DataTypes)]
public class DataTypesServerConfiguration
[DataType(Namespace = Namespaces.DataTypes)]
public sealed partial class DataTypesServerConfiguration
{
#region Constructors
/// <summary>
Expand All @@ -49,15 +49,6 @@ public DataTypesServerConfiguration()
Initialize();
}

/// <summary>
/// Initializes the object during deserialization.
/// </summary>
[OnDeserializing()]
private void Initialize(StreamingContext context)
{
Initialize();
}

/// <summary>
/// Sets private members to default values.
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions Workshop/Empty/Server/Empty Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,11 @@
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>2.0.0-preview.2</Version>
</PackageReference>

<PackageReference
Include="OPCFoundation.NetStandard.Opc.Ua.SourceGeneration"
Version="2.0.0-preview.2"
OutputItemType="Analyzer"
ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Workshop/Empty/Server/EmptyNodeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<EmptyServerConfiguration>();

// use suitable defaults if no configuration exists.
if (m_configuration == null)
Expand Down
Loading
Loading