From 3dd761aebe6fa4ae3be07163cf6e1b7f64df61d9 Mon Sep 17 00:00:00 2001 From: Marc Schier Date: Sun, 5 Oct 2025 10:39:42 +0200 Subject: [PATCH 1/3] Update --- .../Opc.Ua.Sample/Base/CustomNodeManager.cs | 10 ++--- .../Base/DataChangeMonitoredItem.cs | 15 +++++-- .../Opc.Ua.Sample/Base/SampleNodeManager.cs | 42 +++++++++---------- .../Opc.Ua.Sample/Boiler/BoilerNodeManager.cs | 8 ++-- .../MemoryBuffer/MemoryBufferNodeManager.cs | 16 +++---- .../TestData/TestDataNodeManager.cs | 28 ++++++------- 6 files changed, 63 insertions(+), 56 deletions(-) diff --git a/Samples/Opc.Ua.Sample/Base/CustomNodeManager.cs b/Samples/Opc.Ua.Sample/Base/CustomNodeManager.cs index 9f6acc759..0330aab03 100644 --- a/Samples/Opc.Ua.Sample/Base/CustomNodeManager.cs +++ b/Samples/Opc.Ua.Sample/Base/CustomNodeManager.cs @@ -2205,7 +2205,7 @@ public virtual void CreateMonitoredItems( IList filterErrors, IList monitoredItems, bool createDurable, - ref long globalIdCounter) + MonitoredItemIdFactory globalIdCounter) { ServerSystemContext systemContext = m_systemContext.Copy(context); IDictionary operationCache = new NodeIdDictionary(); @@ -2263,7 +2263,7 @@ public virtual void CreateMonitoredItems( context.DiagnosticsMask, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterError, out monitoredItem); @@ -2309,7 +2309,7 @@ public virtual void CreateMonitoredItems( context.DiagnosticsMask, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterError, out monitoredItem); @@ -2421,7 +2421,7 @@ protected virtual ServiceResult CreateMonitoredItem( DiagnosticsMasks diagnosticsMasks, TimestampsToReturn timestampsToReturn, MonitoredItemCreateRequest itemToCreate, - ref long globalIdCounter, + MonitoredItemIdFactory globalIdCounter, out MonitoringFilterResult filterError, out IMonitoredItem monitoredItem) { @@ -2481,7 +2481,7 @@ protected virtual ServiceResult CreateMonitoredItem( } // create a globally unique identifier. - uint monitoredItemId = Utils.IncrementIdentifier(ref globalIdCounter); + uint monitoredItemId = globalIdCounter.GetNextId(); // determine the sampling interval. double samplingInterval = itemToCreate.RequestedParameters.SamplingInterval; diff --git a/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs b/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs index 1a70ec592..4b1837377 100644 --- a/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs +++ b/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -30,6 +30,8 @@ using System; using System.Collections.Generic; using System.Text; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Opc.Ua.Server; namespace Opc.Ua.Sample @@ -252,7 +254,7 @@ public ServiceResult Modify( m_samplingInterval = samplingInterval; - // calculate the next sampling interval. + // calculate the next sampling interval. long newSamplingInterval = (long)(m_samplingInterval * TimeSpan.TicksPerMillisecond); if (m_samplingInterval > 0) @@ -850,7 +852,12 @@ private void Publish( diagnostics.Enqueue(diagnosticInfo); } - public bool Publish(OperationContext context, Queue notifications, Queue diagnostics, uint maxNotificationsPerPublish) + public bool Publish( + OperationContext context, + Queue notifications, + Queue diagnostics, + uint maxNotificationsPerPublish, + ILogger logger) { return Publish(context, notifications, diagnostics); } diff --git a/Samples/Opc.Ua.Sample/Base/SampleNodeManager.cs b/Samples/Opc.Ua.Sample/Base/SampleNodeManager.cs index 5ad6bef8a..802ffb3d9 100644 --- a/Samples/Opc.Ua.Sample/Base/SampleNodeManager.cs +++ b/Samples/Opc.Ua.Sample/Base/SampleNodeManager.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -56,7 +56,7 @@ public SampleNodeManager(IServerInternal server) m_systemContext.SystemHandle = null; m_systemContext.NodeIdFactory = this; - // create the table of nodes. + // create the table of nodes. m_predefinedNodes = new NodeIdDictionary(); m_rootNotifiers = new List(); m_sampledItems = new List(); @@ -340,7 +340,7 @@ protected set /// /// The externalReferences is an out parameter that allows the node manager to link to nodes /// in other node managers. For example, the 'Objects' node is managed by the CoreNodeManager and - /// should have a reference to the root folder node(s) exposed by this node manager. + /// should have a reference to the root folder node(s) exposed by this node manager. /// public virtual void CreateAddressSpace(IDictionary> externalReferences) { @@ -518,7 +518,7 @@ protected virtual void RemovePredefinedNode( /// protected virtual void OnNodeRemoved(NodeState node) { - // overridden by the sub-class. + // overridden by the sub-class. } /// @@ -722,7 +722,7 @@ protected void AddTypesToTypeTree(NodeId typeId) } /// - /// Finds the specified and checks if it is of the expected type. + /// Finds the specified and checks if it is of the expected type. /// /// Returns null if not found or not of the correct type. public NodeState FindPredefinedNode(NodeId nodeId, Type expectedType) @@ -766,7 +766,7 @@ public virtual void DeleteAddressSpace() /// Returns a unique handle for the node. /// /// - /// This must efficiently determine whether the node belongs to the node manager. If it does belong to + /// This must efficiently determine whether the node belongs to the node manager. If it does belong to /// NodeManager it should return a handle that does not require the NodeId to be validated again when /// the handle is passed into other methods such as 'Read' or 'Write'. /// @@ -782,7 +782,7 @@ public virtual object GetManagerHandle(NodeId nodeId) /// Returns a unique handle for the node. /// /// - /// This must efficiently determine whether the node belongs to the node manager. If it does belong to + /// This must efficiently determine whether the node belongs to the node manager. If it does belong to /// NodeManager it should return a handle that does not require the NodeId to be validated again when /// the handle is passed into other methods such as 'Read' or 'Write'. /// @@ -1031,7 +1031,7 @@ public virtual void Browse( // apply filters to references. for (IReference reference = browser.Next(); reference != null; reference = browser.Next()) { - // create the type definition reference. + // create the type definition reference. ReferenceDescription description = GetReferenceDescription(context, reference, continuationPoint); if (description == null) @@ -1065,7 +1065,7 @@ private ReferenceDescription GetReferenceDescription( IReference reference, ContinuationPoint continuationPoint) { - // create the type definition reference. + // create the type definition reference. ReferenceDescription description = new ReferenceDescription(); description.NodeId = reference.TargetId; @@ -1147,9 +1147,9 @@ private ReferenceDescription GetReferenceDescription( /// Returns the target of the specified browse path fragment(s). /// /// - /// If reference exists but the node manager does not know the browse name it must + /// If reference exists but the node manager does not know the browse name it must /// return the NodeId as an unresolvedTargetIds. The caller will try to check the - /// browse name. + /// browse name. /// public virtual void TranslateBrowsePath( OperationContext context, @@ -1975,8 +1975,8 @@ protected virtual ServiceResult Call( /// Subscribes or unsubscribes to events produced by the specified source. /// /// - /// This method is called when a event subscription is created or deletes. The node manager - /// must start/stop reporting events for the specified object and all objects below it in + /// This method is called when a event subscription is created or deletes. The node manager + /// must start/stop reporting events for the specified object and all objects below it in /// the notifier hierarchy. /// public virtual ServiceResult SubscribeToEvents( @@ -2041,7 +2041,7 @@ public virtual ServiceResult SubscribeToEvents( /// Subscribes or unsubscribes to events produced by all event sources. /// /// - /// This method is called when a event subscription is created or deleted. The node + /// This method is called when a event subscription is created or deleted. The node /// manager must start/stop reporting events for all objects that it manages. /// public virtual ServiceResult SubscribeToAllEvents( @@ -2208,7 +2208,7 @@ public virtual void CreateMonitoredItems( IList filterErrors, IList monitoredItems, bool createDurable, - ref long globalIdCounter) + MonitoredItemIdFactory globalIdCounter) { ServerSystemContext systemContext = m_systemContext.Copy(context); IDictionary operationCache = new NodeIdDictionary(); @@ -2266,7 +2266,7 @@ public virtual void CreateMonitoredItems( context.DiagnosticsMask, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterError, out monitoredItem); @@ -2312,7 +2312,7 @@ public virtual void CreateMonitoredItems( context.DiagnosticsMask, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterError, out monitoredItem); @@ -2459,7 +2459,7 @@ protected virtual ServiceResult CreateMonitoredItem( DiagnosticsMasks diagnosticsMasks, TimestampsToReturn timestampsToReturn, MonitoredItemCreateRequest itemToCreate, - ref long globalIdCounter, + MonitoredItemIdFactory globalIdCounter, out MonitoringFilterResult filterError, out IMonitoredItem monitoredItem) { @@ -2527,7 +2527,7 @@ protected virtual ServiceResult CreateMonitoredItem( } // create a globally unique identifier. - uint monitoredItemId = Utils.IncrementIdentifier(ref globalIdCounter); + uint monitoredItemId = globalIdCounter.GetNextId(); // determine the sampling interval. double samplingInterval = itemToCreate.RequestedParameters.SamplingInterval; @@ -2644,7 +2644,7 @@ private void DeleteSampledItem(DataChangeMonitoredItem monitoredItem) } /// - /// Polls each monitored item which requires sample. + /// Polls each monitored item which requires sample. /// private void DoSample(object state) { diff --git a/Samples/Opc.Ua.Sample/Boiler/BoilerNodeManager.cs b/Samples/Opc.Ua.Sample/Boiler/BoilerNodeManager.cs index 4525f1d28..b87ff9fff 100644 --- a/Samples/Opc.Ua.Sample/Boiler/BoilerNodeManager.cs +++ b/Samples/Opc.Ua.Sample/Boiler/BoilerNodeManager.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -109,7 +109,7 @@ public override NodeId New(ISystemContext context, NodeState node) /// /// The externalReferences is an out parameter that allows the node manager to link to nodes /// in other node managers. For example, the 'Objects' node is managed by the CoreNodeManager and - /// should have a reference to the root folder node(s) exposed by this node manager. + /// should have a reference to the root folder node(s) exposed by this node manager. /// public override void CreateAddressSpace(IDictionary> externalReferences) { @@ -305,7 +305,7 @@ protected override void OnSetMonitoringMode( #region Private Fields private ushort m_namespaceIndex; private ushort m_typeNamespaceIndex; - private long m_lastUsedId; + private uint m_lastUsedId; private List m_boilers; #endregion } diff --git a/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferNodeManager.cs b/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferNodeManager.cs index 592f15ff6..466a9cfc1 100644 --- a/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferNodeManager.cs +++ b/Samples/Opc.Ua.Sample/MemoryBuffer/MemoryBufferNodeManager.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -103,7 +103,7 @@ public MemoryBufferNodeManager(IServerInternal server, ApplicationConfiguration /// /// The externalReferences is an out parameter that allows the node manager to link to nodes /// in other node managers. For example, the 'Objects' node is managed by the CoreNodeManager and - /// should have a reference to the root folder node(s) exposed by this node manager. + /// should have a reference to the root folder node(s) exposed by this node manager. /// public override void CreateAddressSpace(IDictionary> externalReferences) { @@ -176,7 +176,7 @@ public override void DeleteAddressSpace() /// Returns a unique handle for the node. /// /// - /// This must efficiently determine whether the node belongs to the node manager. If it does belong to + /// This must efficiently determine whether the node belongs to the node manager. If it does belong to /// NodeManager it should return a handle that does not require the NodeId to be validated again when /// the handle is passed into other methods such as 'Read' or 'Write'. /// @@ -245,7 +245,7 @@ protected override object GetManagerHandle(ISystemContext context, NodeId nodeId // operations and pointers to functions in the buffer object that // allow the value to be accessed. These tags are ephemeral and are // discarded after the operation completes. This design pattern allows - // the server to expose potentially millions of UA nodes without + // the server to expose potentially millions of UA nodes without // creating millions of objects that reside in memory. return new MemoryTagState(buffer, offset); } @@ -268,7 +268,7 @@ protected override ServiceResult CreateMonitoredItem( DiagnosticsMasks diagnosticsMasks, TimestampsToReturn timestampsToReturn, MonitoredItemCreateRequest itemToCreate, - ref long globalIdCounter, + MonitoredItemIdFactory globalIdCounter, out MonitoringFilterResult filterError, out IMonitoredItem monitoredItem) { @@ -288,7 +288,7 @@ protected override ServiceResult CreateMonitoredItem( diagnosticsMasks, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterError, out monitoredItem); } @@ -345,7 +345,7 @@ protected override ServiceResult CreateMonitoredItem( } // create a globally unique identifier. - uint monitoredItemId = Utils.IncrementIdentifier(ref globalIdCounter); + uint monitoredItemId = globalIdCounter.GetNextId(); // determine the sampling interval. double samplingInterval = itemToCreate.RequestedParameters.SamplingInterval; diff --git a/Samples/Opc.Ua.Sample/TestData/TestDataNodeManager.cs b/Samples/Opc.Ua.Sample/TestData/TestDataNodeManager.cs index 4d1ffbc89..d11920dcd 100644 --- a/Samples/Opc.Ua.Sample/TestData/TestDataNodeManager.cs +++ b/Samples/Opc.Ua.Sample/TestData/TestDataNodeManager.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -137,7 +137,7 @@ public override NodeId New(ISystemContext context, NodeState node) /// /// The externalReferences is an out parameter that allows the node manager to link to nodes /// in other node managers. For example, the 'Objects' node is managed by the CoreNodeManager and - /// should have a reference to the root folder node(s) exposed by this node manager. + /// should have a reference to the root folder node(s) exposed by this node manager. /// public override void CreateAddressSpace(IDictionary> externalReferences) { @@ -152,7 +152,7 @@ public override void CreateAddressSpace(IDictionary> e #if CONDITION_SAMPLES // start monitoring the system status. m_systemStatusCondition = (TestSystemConditionState)FindPredefinedNode( - new NodeId(Objects.Data_Conditions_SystemStatus, m_typeNamespaceIndex), + new NodeId(Objects.Data_Conditions_SystemStatus, m_typeNamespaceIndex), typeof(TestSystemConditionState)); if (m_systemStatusCondition != null) @@ -641,7 +641,7 @@ private void OnCheckSystemStatus(object state) lock (Lock) { try - { + { // create the dialog. if (m_dialog == null) { @@ -656,7 +656,7 @@ private void OnCheckSystemStatus(object state) m_dialog.OnAfterResponse = OnDialogComplete; } - + StatusCode systemStatus = m_system.SystemStatus; m_systemStatusCondition.UpdateStatus(systemStatus); @@ -681,12 +681,12 @@ private void OnCheckSystemStatus(object state) if (StatusCode.IsBad(systemStatus)) { m_dialog.RequestResponse( - SystemContext, - "Reset the test system?", + SystemContext, + "Reset the test system?", (uint)(int)(DialogConditionChoice.Ok | DialogConditionChoice.Cancel), (ushort)EventSeverity.MediumHigh); } - + // report the event. TranslationInfo info = new TranslationInfo( "TestSystemStatusChange", @@ -705,14 +705,14 @@ private void OnCheckSystemStatus(object state) Utils.LogError(e, "Unexpected error monitoring system status."); } } - } - + } + /// /// Handles a user response to a dialog. /// private ServiceResult OnDialogComplete( - ISystemContext context, - DialogConditionState dialog, + ISystemContext context, + DialogConditionState dialog, DialogConditionChoice response) { if (m_dialog != null) @@ -730,7 +730,7 @@ private ServiceResult OnDialogComplete( private ushort m_namespaceIndex; private ushort m_typeNamespaceIndex; private TestDataSystem m_system; - private long m_lastUsedId; + private uint m_lastUsedId; #if CONDITION_SAMPLES private Timer m_systemStatusTimer; private TestSystemConditionState m_systemStatusCondition; From a05a30e9c8fb80d9046bf4091c1be453fc06d1cc Mon Sep 17 00:00:00 2001 From: Marc Schier Date: Mon, 6 Oct 2025 14:01:19 +0200 Subject: [PATCH 2/3] Updates --- Samples/Client.Net4/UA Sample Client.csproj | 4 +- .../UA Client Controls.csproj | 8 +- .../Controls.Net4/Sessions/SessionOpenDlg.cs | 2 +- .../Controls.Net4/UA Sample Controls.csproj | 4 +- .../GDS/Client/GlobalDiscoveryClient.csproj | 4 +- .../GlobalDiscoveryClientControls.csproj | 4 +- .../NetCoreGlobalDiscoveryServer.csproj | 4 +- .../GDS/Server/GlobalDiscoveryServer.csproj | 6 +- Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj | 4 +- .../ReferenceClient/Reference Client.csproj | 8 +- .../ReferenceServer/Reference Server.csproj | 6 +- Samples/Server.Net4/UA Sample Server.csproj | 4 +- .../UA Server Controls.csproj | 6 +- UA Samples.slnx | 88 +++++++++++++++++++ .../Client/Aggregation Client.csproj | 2 +- .../ConsoleAggregationServer.csproj | 6 +- .../Server/Aggregation Server.csproj | 8 +- .../Aggregation/Server/AggregationServer.cs | 6 +- .../Client/AlarmCondition Client.csproj | 2 +- .../Server/AlarmCondition Server.csproj | 2 +- Workshop/Boiler/Client/Boiler Client.csproj | 2 +- Workshop/Boiler/Server/Boiler Server.csproj | 2 +- Workshop/Common/Quickstart Library.csproj | 2 +- Workshop/Common/QuickstartNodeManager.cs | 8 +- .../Client/DataAccess Client.csproj | 2 +- .../Server/DataAccess Server.csproj | 2 +- .../DataTypes/Client/DataTypes Client.csproj | 2 +- .../DataTypes/Common/DataTypes Library.csproj | 2 +- .../DataTypes/Server/DataTypes Server.csproj | 2 +- Workshop/Empty/Client/Empty Client.csproj | 2 +- Workshop/Empty/Server/Empty Server.csproj | 2 +- .../Client/HistoricalAccess Client.csproj | 2 +- .../Server/HistoricalAccess Server.csproj | 2 +- .../Tester/Aggregate Tester.csproj | 4 +- .../Client/HistoricalEvents Client.csproj | 2 +- .../Server/HistoricalEvents Server.csproj | 2 +- Workshop/Methods/Client/MainForm.cs | 2 +- Workshop/Methods/Client/Methods Client.csproj | 2 +- Workshop/Methods/Server/Methods Server.csproj | 2 +- .../PerfTest/Client/PerfTest Client.csproj | 2 +- .../PerfTest/Server/PerfTest Server.csproj | 2 +- .../Client/SimpleEvents Client.csproj | 2 +- .../Server/SimpleEvents Server.csproj | 2 +- .../UserAuthentication/Client/MainForm.cs | 2 +- .../Client/UserAuthentication Client.csproj | 2 +- .../Server/UserAuthentication Server.csproj | 2 +- Workshop/Views/Client/Views Client.csproj | 2 +- Workshop/Views/Server/Views Server.csproj | 2 +- 48 files changed, 165 insertions(+), 77 deletions(-) create mode 100644 UA Samples.slnx diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj index c49c114e6..c8267725d 100644 --- a/Samples/Client.Net4/UA Sample Client.csproj +++ b/Samples/Client.Net4/UA Sample Client.csproj @@ -137,10 +137,10 @@ - 9.0.8 + 9.0.9 - 1.5.377.21 + 1.5.377.34-preview 4.3.4 diff --git a/Samples/ClientControls.Net4/UA Client Controls.csproj b/Samples/ClientControls.Net4/UA Client Controls.csproj index 8f9783790..76c74b1c8 100644 --- a/Samples/ClientControls.Net4/UA Client Controls.csproj +++ b/Samples/ClientControls.Net4/UA Client Controls.csproj @@ -1017,16 +1017,16 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/Controls.Net4/Sessions/SessionOpenDlg.cs b/Samples/Controls.Net4/Sessions/SessionOpenDlg.cs index d4d88b23d..1c5e896a5 100644 --- a/Samples/Controls.Net4/Sessions/SessionOpenDlg.cs +++ b/Samples/Controls.Net4/Sessions/SessionOpenDlg.cs @@ -53,7 +53,7 @@ public SessionOpenDlg() #region Private Fields private Session m_session; private const string m_BrowseCertificates = ""; - private static long m_Counter = 0; + private static uint m_Counter = 0; private IList m_preferredLocales; private bool m_checkDomain = true; #endregion diff --git a/Samples/Controls.Net4/UA Sample Controls.csproj b/Samples/Controls.Net4/UA Sample Controls.csproj index e0fe6c38b..bb67ad564 100644 --- a/Samples/Controls.Net4/UA Sample Controls.csproj +++ b/Samples/Controls.Net4/UA Sample Controls.csproj @@ -700,10 +700,10 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/GDS/Client/GlobalDiscoveryClient.csproj b/Samples/GDS/Client/GlobalDiscoveryClient.csproj index bb45b5ae3..f0502242b 100644 --- a/Samples/GDS/Client/GlobalDiscoveryClient.csproj +++ b/Samples/GDS/Client/GlobalDiscoveryClient.csproj @@ -141,10 +141,10 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj index 7d8e5f44b..bcb95ce64 100644 --- a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj +++ b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj @@ -219,10 +219,10 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj index 463bc7522..78a325480 100644 --- a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj +++ b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Samples/GDS/Server/GlobalDiscoveryServer.csproj b/Samples/GDS/Server/GlobalDiscoveryServer.csproj index 017dae0fe..3474cbdd1 100644 --- a/Samples/GDS/Server/GlobalDiscoveryServer.csproj +++ b/Samples/GDS/Server/GlobalDiscoveryServer.csproj @@ -7,7 +7,7 @@ 2.0 PackageReference true - {2E23571F-9987-4EBD-A9FD-5D5DD639E071} + {7148B244-B5A3-8F10-C50F-41B165904823} WinExe Properties Opc.Ua.Gds.Server @@ -235,10 +235,10 @@ 6.5.1 - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj index 80351b593..dc610f904 100644 --- a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj +++ b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/Samples/ReferenceClient/Reference Client.csproj b/Samples/ReferenceClient/Reference Client.csproj index 06bb60c94..024d466b8 100644 --- a/Samples/ReferenceClient/Reference Client.csproj +++ b/Samples/ReferenceClient/Reference Client.csproj @@ -129,16 +129,16 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/ReferenceServer/Reference Server.csproj b/Samples/ReferenceServer/Reference Server.csproj index 8d3ec8fb3..b02221855 100644 --- a/Samples/ReferenceServer/Reference Server.csproj +++ b/Samples/ReferenceServer/Reference Server.csproj @@ -141,13 +141,13 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview 4.3.0 diff --git a/Samples/Server.Net4/UA Sample Server.csproj b/Samples/Server.Net4/UA Sample Server.csproj index 7d30f7f6c..97da3ae06 100644 --- a/Samples/Server.Net4/UA Sample Server.csproj +++ b/Samples/Server.Net4/UA Sample Server.csproj @@ -145,10 +145,10 @@ - 9.0.8 + 9.0.9 - 1.5.377.21 + 1.5.377.34-preview diff --git a/Samples/ServerControls.Net4/UA Server Controls.csproj b/Samples/ServerControls.Net4/UA Server Controls.csproj index 768d5ed38..df19992b7 100644 --- a/Samples/ServerControls.Net4/UA Server Controls.csproj +++ b/Samples/ServerControls.Net4/UA Server Controls.csproj @@ -150,13 +150,13 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/UA Samples.slnx b/UA Samples.slnx new file mode 100644 index 000000000..8190a0c55 --- /dev/null +++ b/UA Samples.slnx @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Workshop/Aggregation/Client/Aggregation Client.csproj b/Workshop/Aggregation/Client/Aggregation Client.csproj index 4afb247e0..f5a18fcbd 100644 --- a/Workshop/Aggregation/Client/Aggregation Client.csproj +++ b/Workshop/Aggregation/Client/Aggregation Client.csproj @@ -136,7 +136,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj index 8f31ecd88..c69153afb 100644 --- a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj +++ b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj @@ -48,9 +48,9 @@ - - - + + + diff --git a/Workshop/Aggregation/Server/Aggregation Server.csproj b/Workshop/Aggregation/Server/Aggregation Server.csproj index 7d2beb24c..15653f443 100644 --- a/Workshop/Aggregation/Server/Aggregation Server.csproj +++ b/Workshop/Aggregation/Server/Aggregation Server.csproj @@ -131,16 +131,16 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Aggregation/Server/AggregationServer.cs b/Workshop/Aggregation/Server/AggregationServer.cs index 21c968ab7..693bbf800 100644 --- a/Workshop/Aggregation/Server/AggregationServer.cs +++ b/Workshop/Aggregation/Server/AggregationServer.cs @@ -2,7 +2,7 @@ * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved. * * OPC Foundation MIT License 1.00 - * + * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, @@ -43,7 +43,7 @@ namespace AggregationServer /// Each server instance must have one instance of a StandardServer object which is /// responsible for reading the configuration file, creating the endpoints and dispatching /// incoming requests to the appropriate handler. - /// + /// /// This sub-class specifies non-configurable metadata such as Product Name and initializes /// the AggregationNodeManager which provides access to the data exposed by the Server. /// diff --git a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj index d318a4c04..9b90e7486 100644 --- a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj +++ b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj @@ -217,7 +217,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj index 771cd21ba..8751d5315 100644 --- a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj +++ b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj @@ -180,7 +180,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Boiler/Client/Boiler Client.csproj b/Workshop/Boiler/Client/Boiler Client.csproj index aeff3dae4..e61704ade 100644 --- a/Workshop/Boiler/Client/Boiler Client.csproj +++ b/Workshop/Boiler/Client/Boiler Client.csproj @@ -143,7 +143,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Boiler/Server/Boiler Server.csproj b/Workshop/Boiler/Server/Boiler Server.csproj index ae4fb5e6b..94fd30032 100644 --- a/Workshop/Boiler/Server/Boiler Server.csproj +++ b/Workshop/Boiler/Server/Boiler Server.csproj @@ -141,7 +141,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Common/Quickstart Library.csproj b/Workshop/Common/Quickstart Library.csproj index 1b34baea4..39763ce90 100644 --- a/Workshop/Common/Quickstart Library.csproj +++ b/Workshop/Common/Quickstart Library.csproj @@ -133,7 +133,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Common/QuickstartNodeManager.cs b/Workshop/Common/QuickstartNodeManager.cs index ef86b1519..ce7269d0d 100644 --- a/Workshop/Common/QuickstartNodeManager.cs +++ b/Workshop/Common/QuickstartNodeManager.cs @@ -3096,7 +3096,7 @@ public virtual void CreateMonitoredItems( IList filterResults, IList monitoredItems, bool createDurable, - ref long globalIdCounter) + MonitoredItemIdFactory globalIdCounter) { ServerSystemContext systemContext = m_systemContext.Copy(context); IDictionary operationCache = new NodeIdDictionary(); @@ -3171,7 +3171,7 @@ public virtual void CreateMonitoredItems( context.DiagnosticsMask, timestampsToReturn, itemToCreate, - ref globalIdCounter, + globalIdCounter, out filterResult, out monitoredItem); } @@ -3216,7 +3216,7 @@ protected virtual ServiceResult CreateMonitoredItem( DiagnosticsMasks diagnosticsMasks, TimestampsToReturn timestampsToReturn, MonitoredItemCreateRequest itemToCreate, - ref long globalIdCounter, + MonitoredItemIdFactory globalIdCounter, out MonitoringFilterResult filterResult, out IMonitoredItem monitoredItem) { @@ -3245,7 +3245,7 @@ protected virtual ServiceResult CreateMonitoredItem( handle.MonitoredNode = monitoredNode; // create a globally unique identifier. - uint monitoredItemId = Utils.IncrementIdentifier(ref globalIdCounter); + uint monitoredItemId = globalIdCounter.GetNextId(); // determine the sampling interval. double samplingInterval = itemToCreate.RequestedParameters.SamplingInterval; diff --git a/Workshop/DataAccess/Client/DataAccess Client.csproj b/Workshop/DataAccess/Client/DataAccess Client.csproj index 486738dc4..356ebf843 100644 --- a/Workshop/DataAccess/Client/DataAccess Client.csproj +++ b/Workshop/DataAccess/Client/DataAccess Client.csproj @@ -185,7 +185,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/DataAccess/Server/DataAccess Server.csproj b/Workshop/DataAccess/Server/DataAccess Server.csproj index 31405e961..c8e843d60 100644 --- a/Workshop/DataAccess/Server/DataAccess Server.csproj +++ b/Workshop/DataAccess/Server/DataAccess Server.csproj @@ -168,7 +168,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/DataTypes/Client/DataTypes Client.csproj b/Workshop/DataTypes/Client/DataTypes Client.csproj index f1b40b8b1..bf32da468 100644 --- a/Workshop/DataTypes/Client/DataTypes Client.csproj +++ b/Workshop/DataTypes/Client/DataTypes Client.csproj @@ -125,7 +125,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/DataTypes/Common/DataTypes Library.csproj b/Workshop/DataTypes/Common/DataTypes Library.csproj index 4f3ae3762..00b28f1b0 100644 --- a/Workshop/DataTypes/Common/DataTypes Library.csproj +++ b/Workshop/DataTypes/Common/DataTypes Library.csproj @@ -104,7 +104,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/DataTypes/Server/DataTypes Server.csproj b/Workshop/DataTypes/Server/DataTypes Server.csproj index 31453544d..25180965b 100644 --- a/Workshop/DataTypes/Server/DataTypes Server.csproj +++ b/Workshop/DataTypes/Server/DataTypes Server.csproj @@ -145,7 +145,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Empty/Client/Empty Client.csproj b/Workshop/Empty/Client/Empty Client.csproj index 4123d6d23..7d537d39b 100644 --- a/Workshop/Empty/Client/Empty Client.csproj +++ b/Workshop/Empty/Client/Empty Client.csproj @@ -134,7 +134,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Empty/Server/Empty Server.csproj b/Workshop/Empty/Server/Empty Server.csproj index 302cea525..f3fb852f5 100644 --- a/Workshop/Empty/Server/Empty Server.csproj +++ b/Workshop/Empty/Server/Empty Server.csproj @@ -131,7 +131,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj index b2cadd427..e73fa84c0 100644 --- a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj +++ b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj @@ -180,7 +180,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj index 66bda8747..d0c31b078 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj +++ b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj @@ -194,7 +194,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj index 7e7d987c5..1ed1da370 100644 --- a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj +++ b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj @@ -144,10 +144,10 @@ - 1.5.377.21 + 1.5.377.34-preview - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj index ef5989b37..bc423f1a9 100644 --- a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj +++ b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj @@ -189,7 +189,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj index 025689be1..0f43c7e54 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj +++ b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj @@ -144,7 +144,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Methods/Client/MainForm.cs b/Workshop/Methods/Client/MainForm.cs index 7f845c4a9..376fc308a 100644 --- a/Workshop/Methods/Client/MainForm.cs +++ b/Workshop/Methods/Client/MainForm.cs @@ -169,7 +169,7 @@ private async void Server_ConnectCompleteAsync(object sender, EventArgs e) // subscribe to the state if available. if (nodes.Count > 0 && !NodeId.IsNull(nodes[0])) { - m_subscription = new Subscription(); + m_subscription = new Subscription(null); m_subscription.PublishingEnabled = true; m_subscription.PublishingInterval = 1000; diff --git a/Workshop/Methods/Client/Methods Client.csproj b/Workshop/Methods/Client/Methods Client.csproj index 45a700a59..1f4d99dd6 100644 --- a/Workshop/Methods/Client/Methods Client.csproj +++ b/Workshop/Methods/Client/Methods Client.csproj @@ -134,7 +134,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Methods/Server/Methods Server.csproj b/Workshop/Methods/Server/Methods Server.csproj index 879bbeb44..5ef074db8 100644 --- a/Workshop/Methods/Server/Methods Server.csproj +++ b/Workshop/Methods/Server/Methods Server.csproj @@ -133,7 +133,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/PerfTest/Client/PerfTest Client.csproj b/Workshop/PerfTest/Client/PerfTest Client.csproj index 6bd632ff5..c2d43cfd1 100644 --- a/Workshop/PerfTest/Client/PerfTest Client.csproj +++ b/Workshop/PerfTest/Client/PerfTest Client.csproj @@ -132,7 +132,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/PerfTest/Server/PerfTest Server.csproj b/Workshop/PerfTest/Server/PerfTest Server.csproj index 1187346c3..9d86b7910 100644 --- a/Workshop/PerfTest/Server/PerfTest Server.csproj +++ b/Workshop/PerfTest/Server/PerfTest Server.csproj @@ -135,7 +135,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj index c77593478..d98437a4e 100644 --- a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj +++ b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj @@ -121,7 +121,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj index a7b502cff..0e6044ac2 100644 --- a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj +++ b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj @@ -139,7 +139,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/UserAuthentication/Client/MainForm.cs b/Workshop/UserAuthentication/Client/MainForm.cs index 42ee2cc89..c7dc0fccd 100644 --- a/Workshop/UserAuthentication/Client/MainForm.cs +++ b/Workshop/UserAuthentication/Client/MainForm.cs @@ -473,7 +473,7 @@ private void CertificateImpersonateBTN_Click(object sender, EventArgs e) // want to get error text for this call. m_session.ReturnDiagnostics = DiagnosticsMasks.All; - UserIdentity identity = new UserIdentity(certificate); + UserIdentity identity = new UserIdentity(certificate, null); string[] preferredLocales = PreferredLocalesTB.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); m_session.UpdateSession(identity, preferredLocales); diff --git a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj index 30c86a8e4..20b4f13e7 100644 --- a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj +++ b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj @@ -127,7 +127,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj index 0e6bd9353..121e9a4c2 100644 --- a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj +++ b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj @@ -156,7 +156,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Views/Client/Views Client.csproj b/Workshop/Views/Client/Views Client.csproj index 4814279cd..9874f69ed 100644 --- a/Workshop/Views/Client/Views Client.csproj +++ b/Workshop/Views/Client/Views Client.csproj @@ -133,7 +133,7 @@ - 1.5.377.21 + 1.5.377.34-preview diff --git a/Workshop/Views/Server/Views Server.csproj b/Workshop/Views/Server/Views Server.csproj index e9d8e3f4e..3ea4b9e0a 100644 --- a/Workshop/Views/Server/Views Server.csproj +++ b/Workshop/Views/Server/Views Server.csproj @@ -147,7 +147,7 @@ - 1.5.377.21 + 1.5.377.34-preview From 5d119aa317e6fcb49b13e5310d28efbef932d9b4 Mon Sep 17 00:00:00 2001 From: Marc Schier Date: Wed, 8 Oct 2025 14:40:09 +0200 Subject: [PATCH 3/3] Update --- Samples/Client.Net4/UA Sample Client.csproj | 2 +- Samples/ClientControls.Net4/UA Client Controls.csproj | 8 ++++---- Samples/Controls.Net4/UA Sample Controls.csproj | 4 ++-- Samples/GDS/Client/GlobalDiscoveryClient.csproj | 4 ++-- .../ClientControls/GlobalDiscoveryClientControls.csproj | 4 ++-- .../GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj | 4 ++-- Samples/GDS/Server/GlobalDiscoveryServer.csproj | 4 ++-- Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj | 4 ++-- Samples/ReferenceClient/Reference Client.csproj | 8 ++++---- Samples/ReferenceServer/Reference Server.csproj | 6 +++--- Samples/Server.Net4/UA Sample Server.csproj | 2 +- Samples/ServerControls.Net4/UA Server Controls.csproj | 6 +++--- Workshop/Aggregation/Client/Aggregation Client.csproj | 2 +- .../ConsoleAggregationServer.csproj | 6 +++--- Workshop/Aggregation/Server/Aggregation Server.csproj | 8 ++++---- .../AlarmCondition/Client/AlarmCondition Client.csproj | 2 +- .../AlarmCondition/Server/AlarmCondition Server.csproj | 2 +- Workshop/Boiler/Client/Boiler Client.csproj | 2 +- Workshop/Boiler/Server/Boiler Server.csproj | 2 +- Workshop/Common/Quickstart Library.csproj | 2 +- Workshop/DataAccess/Client/DataAccess Client.csproj | 2 +- Workshop/DataAccess/Server/DataAccess Server.csproj | 2 +- Workshop/DataTypes/Client/DataTypes Client.csproj | 2 +- Workshop/DataTypes/Common/DataTypes Library.csproj | 2 +- Workshop/DataTypes/Server/DataTypes Server.csproj | 2 +- Workshop/Empty/Client/Empty Client.csproj | 2 +- Workshop/Empty/Server/Empty Server.csproj | 2 +- .../Client/HistoricalAccess Client.csproj | 2 +- .../Server/HistoricalAccess Server.csproj | 2 +- Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj | 4 ++-- .../Client/HistoricalEvents Client.csproj | 2 +- .../Server/HistoricalEvents Server.csproj | 2 +- Workshop/Methods/Client/Methods Client.csproj | 2 +- Workshop/Methods/Server/Methods Server.csproj | 2 +- Workshop/PerfTest/Client/PerfTest Client.csproj | 2 +- Workshop/PerfTest/Server/PerfTest Server.csproj | 2 +- Workshop/SimpleEvents/Client/SimpleEvents Client.csproj | 2 +- Workshop/SimpleEvents/Server/SimpleEvents Server.csproj | 2 +- .../Client/UserAuthentication Client.csproj | 2 +- .../Server/UserAuthentication Server.csproj | 2 +- Workshop/Views/Client/Views Client.csproj | 2 +- Workshop/Views/Server/Views Server.csproj | 2 +- 42 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj index c8267725d..424c153f5 100644 --- a/Samples/Client.Net4/UA Sample Client.csproj +++ b/Samples/Client.Net4/UA Sample Client.csproj @@ -140,7 +140,7 @@ 9.0.9 - 1.5.377.34-preview + 1.5.377.37-preview 4.3.4 diff --git a/Samples/ClientControls.Net4/UA Client Controls.csproj b/Samples/ClientControls.Net4/UA Client Controls.csproj index 76c74b1c8..82bb2e8db 100644 --- a/Samples/ClientControls.Net4/UA Client Controls.csproj +++ b/Samples/ClientControls.Net4/UA Client Controls.csproj @@ -1017,16 +1017,16 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/Controls.Net4/UA Sample Controls.csproj b/Samples/Controls.Net4/UA Sample Controls.csproj index bb67ad564..bc064a380 100644 --- a/Samples/Controls.Net4/UA Sample Controls.csproj +++ b/Samples/Controls.Net4/UA Sample Controls.csproj @@ -700,10 +700,10 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/GDS/Client/GlobalDiscoveryClient.csproj b/Samples/GDS/Client/GlobalDiscoveryClient.csproj index f0502242b..69ddb371f 100644 --- a/Samples/GDS/Client/GlobalDiscoveryClient.csproj +++ b/Samples/GDS/Client/GlobalDiscoveryClient.csproj @@ -141,10 +141,10 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj index bcb95ce64..46c8555d5 100644 --- a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj +++ b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj @@ -219,10 +219,10 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj index 78a325480..dcb2158ea 100644 --- a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj +++ b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Samples/GDS/Server/GlobalDiscoveryServer.csproj b/Samples/GDS/Server/GlobalDiscoveryServer.csproj index 3474cbdd1..b05bc2b90 100644 --- a/Samples/GDS/Server/GlobalDiscoveryServer.csproj +++ b/Samples/GDS/Server/GlobalDiscoveryServer.csproj @@ -235,10 +235,10 @@ 6.5.1 - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj index dc610f904..100fbb69d 100644 --- a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj +++ b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/Samples/ReferenceClient/Reference Client.csproj b/Samples/ReferenceClient/Reference Client.csproj index 024d466b8..89aced0b6 100644 --- a/Samples/ReferenceClient/Reference Client.csproj +++ b/Samples/ReferenceClient/Reference Client.csproj @@ -129,16 +129,16 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/ReferenceServer/Reference Server.csproj b/Samples/ReferenceServer/Reference Server.csproj index b02221855..5eb633b64 100644 --- a/Samples/ReferenceServer/Reference Server.csproj +++ b/Samples/ReferenceServer/Reference Server.csproj @@ -141,13 +141,13 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview 4.3.0 diff --git a/Samples/Server.Net4/UA Sample Server.csproj b/Samples/Server.Net4/UA Sample Server.csproj index 97da3ae06..e2f1b0571 100644 --- a/Samples/Server.Net4/UA Sample Server.csproj +++ b/Samples/Server.Net4/UA Sample Server.csproj @@ -148,7 +148,7 @@ 9.0.9 - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Samples/ServerControls.Net4/UA Server Controls.csproj b/Samples/ServerControls.Net4/UA Server Controls.csproj index df19992b7..ef96e7ef2 100644 --- a/Samples/ServerControls.Net4/UA Server Controls.csproj +++ b/Samples/ServerControls.Net4/UA Server Controls.csproj @@ -150,13 +150,13 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Aggregation/Client/Aggregation Client.csproj b/Workshop/Aggregation/Client/Aggregation Client.csproj index f5a18fcbd..e19b57111 100644 --- a/Workshop/Aggregation/Client/Aggregation Client.csproj +++ b/Workshop/Aggregation/Client/Aggregation Client.csproj @@ -136,7 +136,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj index c69153afb..abf2b85d6 100644 --- a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj +++ b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj @@ -48,9 +48,9 @@ - - - + + + diff --git a/Workshop/Aggregation/Server/Aggregation Server.csproj b/Workshop/Aggregation/Server/Aggregation Server.csproj index 15653f443..7018d8c73 100644 --- a/Workshop/Aggregation/Server/Aggregation Server.csproj +++ b/Workshop/Aggregation/Server/Aggregation Server.csproj @@ -131,16 +131,16 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj index 9b90e7486..4eee73334 100644 --- a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj +++ b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj @@ -217,7 +217,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj index 8751d5315..c081e4152 100644 --- a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj +++ b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj @@ -180,7 +180,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Boiler/Client/Boiler Client.csproj b/Workshop/Boiler/Client/Boiler Client.csproj index e61704ade..02f92bc88 100644 --- a/Workshop/Boiler/Client/Boiler Client.csproj +++ b/Workshop/Boiler/Client/Boiler Client.csproj @@ -143,7 +143,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Boiler/Server/Boiler Server.csproj b/Workshop/Boiler/Server/Boiler Server.csproj index 94fd30032..db4888eb7 100644 --- a/Workshop/Boiler/Server/Boiler Server.csproj +++ b/Workshop/Boiler/Server/Boiler Server.csproj @@ -141,7 +141,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Common/Quickstart Library.csproj b/Workshop/Common/Quickstart Library.csproj index 39763ce90..c0f169426 100644 --- a/Workshop/Common/Quickstart Library.csproj +++ b/Workshop/Common/Quickstart Library.csproj @@ -133,7 +133,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/DataAccess/Client/DataAccess Client.csproj b/Workshop/DataAccess/Client/DataAccess Client.csproj index 356ebf843..5b0481267 100644 --- a/Workshop/DataAccess/Client/DataAccess Client.csproj +++ b/Workshop/DataAccess/Client/DataAccess Client.csproj @@ -185,7 +185,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/DataAccess/Server/DataAccess Server.csproj b/Workshop/DataAccess/Server/DataAccess Server.csproj index c8e843d60..86bb15943 100644 --- a/Workshop/DataAccess/Server/DataAccess Server.csproj +++ b/Workshop/DataAccess/Server/DataAccess Server.csproj @@ -168,7 +168,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/DataTypes/Client/DataTypes Client.csproj b/Workshop/DataTypes/Client/DataTypes Client.csproj index bf32da468..e941b33dc 100644 --- a/Workshop/DataTypes/Client/DataTypes Client.csproj +++ b/Workshop/DataTypes/Client/DataTypes Client.csproj @@ -125,7 +125,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/DataTypes/Common/DataTypes Library.csproj b/Workshop/DataTypes/Common/DataTypes Library.csproj index 00b28f1b0..af6d4a60d 100644 --- a/Workshop/DataTypes/Common/DataTypes Library.csproj +++ b/Workshop/DataTypes/Common/DataTypes Library.csproj @@ -104,7 +104,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/DataTypes/Server/DataTypes Server.csproj b/Workshop/DataTypes/Server/DataTypes Server.csproj index 25180965b..5aedef9a7 100644 --- a/Workshop/DataTypes/Server/DataTypes Server.csproj +++ b/Workshop/DataTypes/Server/DataTypes Server.csproj @@ -145,7 +145,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Empty/Client/Empty Client.csproj b/Workshop/Empty/Client/Empty Client.csproj index 7d537d39b..500d92911 100644 --- a/Workshop/Empty/Client/Empty Client.csproj +++ b/Workshop/Empty/Client/Empty Client.csproj @@ -134,7 +134,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Empty/Server/Empty Server.csproj b/Workshop/Empty/Server/Empty Server.csproj index f3fb852f5..e323077f6 100644 --- a/Workshop/Empty/Server/Empty Server.csproj +++ b/Workshop/Empty/Server/Empty Server.csproj @@ -131,7 +131,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj index e73fa84c0..a2e5af37c 100644 --- a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj +++ b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj @@ -180,7 +180,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj index d0c31b078..403f8548c 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj +++ b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj @@ -194,7 +194,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj index 1ed1da370..4bf503442 100644 --- a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj +++ b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj @@ -144,10 +144,10 @@ - 1.5.377.34-preview + 1.5.377.37-preview - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj index bc423f1a9..8556873db 100644 --- a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj +++ b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj @@ -189,7 +189,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj index 0f43c7e54..b3fc819be 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj +++ b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj @@ -144,7 +144,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Methods/Client/Methods Client.csproj b/Workshop/Methods/Client/Methods Client.csproj index 1f4d99dd6..e182567e2 100644 --- a/Workshop/Methods/Client/Methods Client.csproj +++ b/Workshop/Methods/Client/Methods Client.csproj @@ -134,7 +134,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Methods/Server/Methods Server.csproj b/Workshop/Methods/Server/Methods Server.csproj index 5ef074db8..84385d54b 100644 --- a/Workshop/Methods/Server/Methods Server.csproj +++ b/Workshop/Methods/Server/Methods Server.csproj @@ -133,7 +133,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/PerfTest/Client/PerfTest Client.csproj b/Workshop/PerfTest/Client/PerfTest Client.csproj index c2d43cfd1..06c694d02 100644 --- a/Workshop/PerfTest/Client/PerfTest Client.csproj +++ b/Workshop/PerfTest/Client/PerfTest Client.csproj @@ -132,7 +132,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/PerfTest/Server/PerfTest Server.csproj b/Workshop/PerfTest/Server/PerfTest Server.csproj index 9d86b7910..8706c21ac 100644 --- a/Workshop/PerfTest/Server/PerfTest Server.csproj +++ b/Workshop/PerfTest/Server/PerfTest Server.csproj @@ -135,7 +135,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj index d98437a4e..fadea93a4 100644 --- a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj +++ b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj @@ -121,7 +121,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj index 0e6044ac2..bf67a4540 100644 --- a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj +++ b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj @@ -139,7 +139,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj index 20b4f13e7..436362e57 100644 --- a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj +++ b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj @@ -127,7 +127,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj index 121e9a4c2..4a5ebbf75 100644 --- a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj +++ b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj @@ -156,7 +156,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Views/Client/Views Client.csproj b/Workshop/Views/Client/Views Client.csproj index 9874f69ed..e767b5588 100644 --- a/Workshop/Views/Client/Views Client.csproj +++ b/Workshop/Views/Client/Views Client.csproj @@ -133,7 +133,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview diff --git a/Workshop/Views/Server/Views Server.csproj b/Workshop/Views/Server/Views Server.csproj index 3ea4b9e0a..f9344f175 100644 --- a/Workshop/Views/Server/Views Server.csproj +++ b/Workshop/Views/Server/Views Server.csproj @@ -147,7 +147,7 @@ - 1.5.377.34-preview + 1.5.377.37-preview