Bump to latest version 1.4.372.56 (#554)

* update to preview version * formatting * override Logging abstractions * bump to 1.4.372.56 * Bump actions/checkout from 3 to 4 (#555) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
OPCFoundation · Oct 27, 2023 · 9f4f5d2 · 9f4f5d2
1 parent bc2a606
commit 9f4f5d2
Show file tree

Hide file tree

Showing 55 changed files with 392 additions and 381 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj
@@ -265,13 +265,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj
@@ -140,7 +140,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -134,8 +134,11 @@
     <Content Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
+      <Version>7.0.1</Version>
+    </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.4</Version>

diff --git a/Samples/Client/Opc.Ua.SampleClient.csproj b/Samples/Client/Opc.Ua.SampleClient.csproj
@@ -158,7 +158,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua">
-      <Version>1.4.371.96</Version>
+      <Version>1.4.372.56</Version>
     </PackageReference>
     <PackageReference Include="System.Xml.XmlDocument">
       <Version>4.3.0</Version>

diff --git a/Samples/ClientControls.Net4/Common/Client/SubscribeDataListViewCtrl.cs b/Samples/ClientControls.Net4/Common/Client/SubscribeDataListViewCtrl.cs
@@ -51,10 +51,10 @@ public partial class SubscribeDataListViewCtrl : UserControl
         public SubscribeDataListViewCtrl()
         {
             InitializeComponent();
-            m_PublishStatusChanged = new EventHandler(OnPublishStatusChanged);
+            m_PublishStatusChanged = new PublishStateChangedEventHandler(OnPublishStatusChanged);
             ResultsDV.AutoGenerateColumns = false;
             ImageList = new ClientUtils().ImageList;
-            
+
             m_dataset = new DataSet();
             m_dataset.Tables.Add("Requests");
 
@@ -86,7 +86,7 @@ public SubscribeDataListViewCtrl()
         private Subscription m_subscription;
         private DisplayState m_state;
         private EditComplexValueDlg m_EditComplexValueDlg;
-        private EventHandler m_PublishStatusChanged;
+        private PublishStateChangedEventHandler m_PublishStatusChanged;
         #endregion
 
         #region Stage Enum
@@ -196,7 +196,7 @@ public void SetSubscription(Subscription subscription)
                 m_subscription.Handle = this;
             }
         }
-        
+
         /// <summary>
         /// Adds the monitored items to the subscription.
         /// </summary>
@@ -217,7 +217,7 @@ public void AddItems(params ReadValueId[] itemsToMonitor)
                     {
                         continue;
                     }
-                    
+
                     DataRow row = m_dataset.Tables[0].NewRow();
 
                     MonitoredItem monitoredItem = new MonitoredItem(m_subscription.DefaultItem);
@@ -421,7 +421,7 @@ private void UpdateRow(DataRow row, MonitoredItemNotification notification)
 
             if (value != null)
             {
-                row[1]  = ImageList.Images[ClientUtils.GetImageIndex(Attributes.Value, value.Value)];
+                row[1] = ImageList.Images[ClientUtils.GetImageIndex(Attributes.Value, value.Value)];
                 row[12] = (value.WrappedValue.TypeInfo != null) ? value.WrappedValue.TypeInfo.ToString() : String.Empty;
                 row[13] = value.WrappedValue;
                 row[14] = value.StatusCode;
@@ -445,13 +445,13 @@ private string GetDisplayString(Subscription subscription)
             buffer.Append("/");
             buffer.Append(subscription.CurrentLifetimeCount);
             buffer.Append("}");
-            
+
             return buffer.ToString();
         }
         #endregion
 
         #region Event Handlers
-        private void OnPublishStatusChanged(object sender, EventArgs e)
+        private void OnPublishStatusChanged(object sender, PublishStateChangedEventArgs e)
         {
             if (!Object.ReferenceEquals(sender, m_subscription))
             {
@@ -466,12 +466,12 @@ private void OnPublishStatusChanged(object sender, EventArgs e)
 
             try
             {
-                if (m_subscription.PublishingStopped)
+                if ((e.Status & PublishStateChangedMask.Stopped) != 0)
                 {
                     SubscriptionStateTB.Text = "STOPPED";
                     SubscriptionStateTB.ForeColor = Color.Red;
                 }
-                else
+                else if ((e.Status & PublishStateChangedMask.Recovered) != 0)
                 {
                     SubscriptionStateTB.Text = GetDisplayString(m_subscription);
                     SubscriptionStateTB.ForeColor = Color.Empty;
@@ -649,7 +649,7 @@ private void ViewValueMI_Click(object sender, EventArgs e)
 
                 m_EditComplexValueDlg = new EditComplexValueDlg();
                 m_EditComplexValueDlg.Tag = monitoredItem;
-                    
+
                 m_EditComplexValueDlg.ShowDialog(
                     m_session,
                     monitoredItem.ResolvedNodeId,
@@ -706,10 +706,10 @@ private void SetMonitoringModeMI_Click(object sender, EventArgs e)
                 MonitoringMode oldMonitoringMode = monitoredItems[0].MonitoringMode;
                 MonitoringMode newMonitoringMode = new EditMonitoredItemDlg().ShowDialog(oldMonitoringMode);
 
-                if (oldMonitoringMode != newMonitoringMode) 
+                if (oldMonitoringMode != newMonitoringMode)
                 {
                     List<MonitoredItem> itemsToModify = new List<MonitoredItem>();
-                    
+
                     foreach (MonitoredItem monitoredItem in monitoredItems)
                     {
                         DataRow row = (DataRow)monitoredItem.Handle;
@@ -723,7 +723,7 @@ private void SetMonitoringModeMI_Click(object sender, EventArgs e)
 
                         monitoredItem.MonitoringMode = newMonitoringMode;
                     }
-                    
+
                     if (itemsToModify.Count != 0)
                     {
                         m_subscription.SetMonitoringMode(newMonitoringMode, itemsToModify);

diff --git a/Samples/ClientControls.Net4/Common/Client/SubscribeEventsDlg.cs b/Samples/ClientControls.Net4/Common/Client/SubscribeEventsDlg.cs
@@ -56,7 +56,7 @@ public SubscribeEventsDlg()
             BrowseCTRL.BrowseTV.CheckBoxes = true;
             BrowseCTRL.BrowseTV.AfterCheck += new TreeViewEventHandler(BrowseTV_AfterCheck);
 
-            m_PublishStatusChanged = new EventHandler(OnPublishStatusChanged);
+            m_PublishStatusChanged = new PublishStateChangedEventHandler(OnPublishStatusChanged);
             ItemsDV.AutoGenerateColumns = false;
             ImageList = new ClientUtils().ImageList;
 
@@ -74,14 +74,14 @@ public SubscribeEventsDlg()
             ItemsDV.DataSource = m_dataset.Tables[0];
         }
         #endregion
-        
+
         #region Private Fields
         private DataSet m_dataset;
         private FilterDeclaration m_filter;
         private DisplayState m_state;
         private Session m_session;
         private Subscription m_subscription;
-        private EventHandler m_PublishStatusChanged;
+        private PublishStateChangedEventHandler m_PublishStatusChanged;
         #endregion
 
         private enum DisplayState
@@ -389,9 +389,9 @@ private string GetDisplayString(Subscription subscription)
             buffer.Append(" (");
             buffer.Append(subscription.CurrentPublishingInterval);
             buffer.Append("ms/");
-            buffer.Append(subscription.CurrentPublishingInterval*subscription.CurrentKeepAliveCount/1000);
+            buffer.Append(subscription.CurrentPublishingInterval * subscription.CurrentKeepAliveCount / 1000);
             buffer.Append("s/");
-            buffer.Append(subscription.CurrentPublishingInterval*subscription.CurrentLifetimeCount/1000);
+            buffer.Append(subscription.CurrentPublishingInterval * subscription.CurrentLifetimeCount / 1000);
             buffer.Append("s}");
 
             return buffer.ToString();
@@ -504,7 +504,7 @@ private void UpdateFilter()
 
                 fields.Add(field);
             }
-            
+
             // update filter.
             m_filter.EventTypeId = eventTypeId;
             m_filter.Fields = fields;
@@ -644,7 +644,7 @@ private void SetEventTypeChecks(TreeNode node, bool isChecked)
         #endregion
 
         #region Event Handlers
-        private void OnPublishStatusChanged(object sender, EventArgs e)
+        private void OnPublishStatusChanged(object sender, PublishStateChangedEventArgs e)
         {
             if (!Object.ReferenceEquals(sender, m_subscription))
             {
@@ -659,12 +659,12 @@ private void OnPublishStatusChanged(object sender, EventArgs e)
 
             try
             {
-                if (m_subscription.PublishingStopped)
+                if ((e.Status & PublishStateChangedMask.Stopped) != 0)
                 {
                     SubscriptionStateTB.Text = "STOPPED";
                     SubscriptionStateTB.ForeColor = Color.Red;
                 }
-                else
+                else if ((e.Status & PublishStateChangedMask.Recovered) != 0)
                 {
                     SubscriptionStateTB.Text = GetDisplayString(m_subscription);
                     SubscriptionStateTB.ForeColor = Color.Empty;

diff --git a/Samples/ClientControls.Net4/Common/DiscoveredServerOnNetworkListCtrl.cs b/Samples/ClientControls.Net4/Common/DiscoveredServerOnNetworkListCtrl.cs
@@ -57,17 +57,17 @@ public DiscoveredServerOnNetworkListCtrl()
             ItemsLV.MultiSelect = false;
         }
         #endregion
-        
+
         #region Private Fields
         // The columns to display in the control.		
-		private readonly object[][] m_ColumnNames = new object[][]
-		{ 
-			new object[] { "RecordId", HorizontalAlignment.Left, null },  
-			new object[] { "ServerName", HorizontalAlignment.Left, null },
-			new object[] { "DiscoveryUrl", HorizontalAlignment.Left, null },
-			new object[] { "ServerCapabilities",  HorizontalAlignment.Left, null }
-		};
-        
+        private readonly object[][] m_ColumnNames = new object[][]
+        {
+            new object[] { "RecordId", HorizontalAlignment.Left, null },
+            new object[] { "ServerName", HorizontalAlignment.Left, null },
+            new object[] { "DiscoveryUrl", HorizontalAlignment.Left, null },
+            new object[] { "ServerCapabilities",  HorizontalAlignment.Left, null }
+        };
+
         private ApplicationConfiguration m_configuration;
         private int m_discoveryTimeout;
         private int m_discoverCount;
@@ -115,7 +115,7 @@ public void Initialize(string hostname, NumericUpDown startingRecordId, NumericU
             {
                 hostname = System.Net.Dns.GetHostName();
             }
-            
+
             this.Instructions = Utils.Format("Discovering servers on host '{0}'.", hostname);
             AdjustColumns();
 
@@ -131,7 +131,7 @@ public void Initialize(string hostname, NumericUpDown startingRecordId, NumericU
             {
                 discoveryUrls = new StringCollection(Utils.DiscoveryUrls);
             }
-            
+
             // update the urls with the hostname.
             StringCollection urlsToUse = new StringCollection();
 
@@ -154,7 +154,7 @@ private void OnUpdateServers(object state)
                 this.BeginInvoke(new WaitCallback(OnUpdateServers), state);
                 return;
             }
-            
+
             ItemsLV.Items.Clear();
 
             ServerOnNetworkCollection servers = state as ServerOnNetworkCollection;
@@ -254,7 +254,7 @@ private bool DiscoverServersOnNetwork(Uri discoveryUrl)
                 }
                 catch (Exception e)
                 {
-                    Utils.LogError("Error retrieving FindServersOnNetwork parameters. Error=({1}){0}", e.Message, e.GetType());
+                    Utils.LogError("Error retrieving FindServersOnNetwork parameters. Error=({0}){1}", e.GetType(), e.Message);
                     return false;
                 }
 
@@ -265,7 +265,7 @@ private bool DiscoverServersOnNetwork(Uri discoveryUrl)
             }
             catch (Exception e)
             {
-                Utils.LogError("DISCOVERY ERROR - Could not fetch servers from url: {0}. Error=({2}){1}", discoveryUrl, e.Message, e.GetType());
+                Utils.LogError("DISCOVERY ERROR - Could not fetch servers from url: {0}. Error=({1}){2}", discoveryUrl, e.GetType(), e.Message);
                 return false;
             }
             finally
@@ -295,7 +295,7 @@ protected override void UpdateItem(ListViewItem listItem, object item)
             listItem.SubItems[0].Text = String.Format("{0}", server.RecordId);
             listItem.SubItems[1].Text = String.Format("{0}", server.ServerName);
             listItem.SubItems[2].Text = String.Format("{0}", server.DiscoveryUrl);
-            listItem.SubItems[3].Text = String.Format("{0}", string.Join(",", server.ServerCapabilities)); 
+            listItem.SubItems[3].Text = String.Format("{0}", string.Join(",", server.ServerCapabilities));
 
             listItem.ImageKey = GuiUtils.Icons.Service;
         }