Merge pull request #1305 from OPCFoundation/master

Service release for 1.4.365
OPCFoundation · Mar 2, 2021 · 56a5406 · 56a5406
2 parents 4afac20 + 426dcba
commit 56a5406
Show file tree

Hide file tree

Showing 54 changed files with 1,283 additions and 514 deletions.
diff --git a/Applications/ConsoleReferenceClient/Output.cs b/Applications/ConsoleReferenceClient/Output.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Quickstarts.ConsoleReferenceClient
+{
+    public interface IOutput
+    {
+        void WriteLine(object obj);
+        void WriteLine(string msg);
+        void WriteLine(string msg, params object[] parameters);
+    }
+
+    public class ConsoleOutput : IOutput
+    {
+        public void WriteLine(object obj) => Console.WriteLine(obj);
+        public void WriteLine(string msg) => Console.WriteLine(msg);
+        public void WriteLine(string msg, params object[] parameters) => Console.WriteLine(msg, parameters);
+    }
+}
diff --git a/Applications/ConsoleReferenceClient/Program.cs b/Applications/ConsoleReferenceClient/Program.cs
@@ -28,17 +28,18 @@
  * ======================================================================*/
 
 using System;
+using System.Threading.Tasks;
 using Opc.Ua;
 using Opc.Ua.Configuration;
 
 namespace Quickstarts.ConsoleReferenceClient
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            Console.WriteLine("OPC UA Console Reference Client");
-
+            IOutput console = new ConsoleOutput();
+            console.WriteLine("OPC UA Console Reference Client");
             try
             {
                 // Define the UA Client application
@@ -47,14 +48,14 @@ public static void Main(string[] args)
                 application.ApplicationType = ApplicationType.Client;
 
                 // load the application configuration.
-                application.LoadApplicationConfiguration("ConsoleReferenceClient.Config.xml", false).Wait();
+                await application.LoadApplicationConfiguration("ConsoleReferenceClient.Config.xml", silent: false);
                 // check the application certificate.
-                application.CheckApplicationInstanceCertificate(false, 0).Wait();
+                await application.CheckApplicationInstanceCertificate(silent: false, minimumKeySize: 0);
 
                 // create the UA Client object and connect to configured server.
-                UAClient uaClient = new UAClient(application.ApplicationConfiguration);
-
-                if (uaClient.Connect())
+                UAClient uaClient = new UAClient(application.ApplicationConfiguration, console, ClientBase.ValidateResponse);
+                bool connected = await uaClient.ConnectAsync();
+                if (connected)
                 {
                     // Run tests for available methods.
                     uaClient.ReadNodes();
@@ -64,22 +65,22 @@ public static void Main(string[] args)
 
                     uaClient.SubscribeToDataChanges();
                     // Wait for some DataChange notifications from MonitoredItems
-                    System.Threading.Thread.Sleep(20000);
+                    await Task.Delay(20_000);
 
                     uaClient.Disconnect();
                 }
                 else
                 {
-                    Console.WriteLine("Could not connect to server!");
+                    console.WriteLine("Could not connect to server!");
                 }
 
-                Console.WriteLine("\nProgram ended.");
-                Console.WriteLine("Press any key to finish...");
+                console.WriteLine("\nProgram ended.");
+                console.WriteLine("Press any key to finish...");
                 Console.ReadKey();
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                console.WriteLine(ex.Message);
             }
         }
     }