diff --git a/ComIOP/Common/Proxy/OpcProxyUtils.cs b/ComIOP/Common/Proxy/OpcProxyUtils.cs
index b479938180..7f996c33f9 100644
--- a/ComIOP/Common/Proxy/OpcProxyUtils.cs
+++ b/ComIOP/Common/Proxy/OpcProxyUtils.cs
@@ -57,8 +57,7 @@ namespace Opc.Ua.Com
}
// check for certificate with a private key.
- X509Certificate2 certificate = null;
- Task.Run(async () => certificate = await id.Find(true)).Wait();
+ X509Certificate2 certificate = id.Find(true).Result;
if (certificate != null)
{
@@ -94,15 +93,11 @@ namespace Opc.Ua.Com
try
{
- Task.Run(async () =>
+ X509Certificate2Collection certificateCollection = store.FindByThumbprint(certificate.Thumbprint).Result;
+ if (certificateCollection != null)
{
- X509Certificate2Collection certificateCollection = await store.FindByThumbprint(certificate.Thumbprint);
- if (certificateCollection != null)
- {
- await store.Add(certificateCollection[0]);
- }
+ store.Add(certificateCollection[0]).Wait();
}
- ).Wait();
}
finally
{
@@ -120,7 +115,7 @@ namespace Opc.Ua.Com
public static ApplicationConfiguration ApplicationConfigurationLoad(string sectionName, ApplicationType applicationType)
{
ApplicationConfiguration config = null;
- Task.Run(async () => config = await ApplicationConfiguration.Load(sectionName, applicationType)).Wait();
+ config = ApplicationConfiguration.Load(sectionName, applicationType).Result;
return config;
}
diff --git a/ComIOP/Wrapper/ServerWrapper/Program.cs b/ComIOP/Wrapper/ServerWrapper/Program.cs
index 9faa612f73..78b986f8bc 100644
--- a/ComIOP/Wrapper/ServerWrapper/Program.cs
+++ b/ComIOP/Wrapper/ServerWrapper/Program.cs
@@ -50,8 +50,7 @@ namespace Opc.Ua.Com.Client
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Task.Run(async () => await AsyncMain()).Wait();
-
+ AsyncMain().Wait();
}
///
diff --git a/SampleApplications/SDK/Opc.Ua.Client/Session.cs b/SampleApplications/SDK/Opc.Ua.Client/Session.cs
index e071eb42f4..dd0a298486 100644
--- a/SampleApplications/SDK/Opc.Ua.Client/Session.cs
+++ b/SampleApplications/SDK/Opc.Ua.Client/Session.cs
@@ -171,11 +171,8 @@ namespace Opc.Ua.Client
"The client configuration does not specify an application instance certificate.");
}
- Task t = Task.Run( async () =>
- {
- m_instanceCertificate = await m_configuration.SecurityConfiguration.ApplicationCertificate.Find(true);
- });
- t.Wait();
+ m_instanceCertificate = m_configuration.SecurityConfiguration.ApplicationCertificate.Find(true).Result;
+
}
// check for valid certificate.
@@ -202,11 +199,7 @@ namespace Opc.Ua.Client
// load certificate chain
m_instanceCertificateChain = new X509Certificate2Collection(m_instanceCertificate);
List issuers = new List();
- Task t2 = Task.Run(async () =>
- {
- await configuration.CertificateValidator.GetIssuers(m_instanceCertificate, issuers);
- });
- t2.Wait();
+ configuration.CertificateValidator.GetIssuers(m_instanceCertificate, issuers).Wait();
for (int i = 0; i < issuers.Count; i++)
{
diff --git a/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs b/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs
index 8019ea0997..61d12e11b4 100644
--- a/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs
+++ b/SampleApplications/SDK/Opc.Ua.Server/Server/StandardServer.cs
@@ -2245,28 +2245,24 @@ namespace Opc.Ua.Server
///
private void RegistrationValidator_CertificateValidation(CertificateValidator sender, CertificateValidationEventArgs e)
{
- Task t = Task.Run(async () =>
+ System.Net.IPAddress[] targetAddresses = Utils.GetHostAddresses(Utils.GetHostName()).Result;
+
+ foreach (string domain in Utils.GetDomainsFromCertficate(e.Certificate))
{
- System.Net.IPAddress[] targetAddresses = await Utils.GetHostAddresses(Utils.GetHostName());
+ System.Net.IPAddress[] actualAddresses = Utils.GetHostAddresses(domain).Result;
- foreach (string domain in Utils.GetDomainsFromCertficate(e.Certificate))
+ foreach (System.Net.IPAddress actualAddress in actualAddresses)
{
- System.Net.IPAddress[] actualAddresses = await Utils.GetHostAddresses(domain);
-
- foreach (System.Net.IPAddress actualAddress in actualAddresses)
+ foreach (System.Net.IPAddress targetAddress in targetAddresses)
{
- foreach (System.Net.IPAddress targetAddress in targetAddresses)
+ if (targetAddress.Equals(actualAddress))
{
- if (targetAddress.Equals(actualAddress))
- {
- e.Accept = true;
- return;
- }
+ e.Accept = true;
+ return;
}
}
}
- });
- t.Wait();
+ }
}
///
@@ -2608,10 +2604,7 @@ namespace Opc.Ua.Server
Configuration.SecurityConfiguration.TrustedPeerCertificates = configuration.SecurityConfiguration.TrustedPeerCertificates;
Configuration.SecurityConfiguration.RejectedCertificateStore = configuration.SecurityConfiguration.RejectedCertificateStore;
- Task.Run(async () =>
- {
- await Configuration.CertificateValidator.Update(Configuration.SecurityConfiguration);
- }).Wait();
+ Configuration.CertificateValidator.Update(Configuration.SecurityConfiguration).Wait();
// update trace configuration.
Configuration.TraceConfiguration = configuration.TraceConfiguration;
@@ -2907,7 +2900,7 @@ namespace Opc.Ua.Server
{
// unregister from Discovery Server
m_registrationInfo.IsOnline = false;
- Task.Run(async () => await RegisterWithDiscoveryServer()).Wait();
+ RegisterWithDiscoveryServer().Wait();
}
lock (m_lock)
diff --git a/SampleApplications/Samples/Client.Net4/Program.cs b/SampleApplications/Samples/Client.Net4/Program.cs
index a4b74dc70a..97cf0f8ea9 100644
--- a/SampleApplications/Samples/Client.Net4/Program.cs
+++ b/SampleApplications/Samples/Client.Net4/Program.cs
@@ -58,21 +58,17 @@ namespace Opc.Ua.Sample
try
{
- Task task = application.LoadApplicationConfiguration(false);
- task.Wait();
+ application.LoadApplicationConfiguration(false).Wait();
// check the application certificate.
- Task task2 = application.CheckApplicationInstanceCertificate(false, 0);
- task2.Wait();
- bool certOK = task2.Result;
+ bool certOK = application.CheckApplicationInstanceCertificate(false, 0).Result;
if (!certOK)
{
throw new Exception("Application instance certificate invalid!");
}
// start the server.
- Task task3 = application.Start(new SampleServer());
- task3.Wait();
+ application.Start(new SampleServer()).Wait();
// run the application interactively.
Application.Run(new SampleClientForm(application, null, application.ApplicationConfiguration));
diff --git a/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateListDlg.cs b/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateListDlg.cs
index b94a45b836..4dc9c3429d 100644
--- a/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateListDlg.cs
+++ b/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateListDlg.cs
@@ -159,7 +159,7 @@ namespace Opc.Ua.Client.Controls
CertificateStoreIdentifier store = new CertificateStoreIdentifier();
store.StoreType = CertificateStoreCTRL.StoreType;
store.StorePath = CertificateStoreCTRL.StorePath;
- Task.Run( async () => await CertificatesCTRL.Initialize(store, null)).Wait();
+ CertificatesCTRL.Initialize(store, null).Wait();
FilterBTN_Click(sender, e);
}
diff --git a/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs b/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs
index 3bd050db1c..1f48802db6 100644
--- a/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs
+++ b/SampleApplications/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs
@@ -166,7 +166,7 @@ namespace Opc.Ua.Client.Controls
if (m_certificateListCtrl != null)
{
- Task.Run( async () => await m_certificateListCtrl.Initialize(SelectedStore, null)).Wait();
+ m_certificateListCtrl.Initialize(SelectedStore, null).Wait();
}
}
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/Program.cs b/SampleApplications/Samples/NetCoreConsoleServer/Program.cs
index 8b1d0e486e..380ef4bd63 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/Program.cs
+++ b/SampleApplications/Samples/NetCoreConsoleServer/Program.cs
@@ -80,8 +80,7 @@ namespace NetCoreConsoleServer
try
{
- Task t = ConsoleSampleServer();
- t.Wait();
+ ConsoleSampleServer().Wait();
Console.WriteLine("Server started. Press any key to exit...");
}
catch (Exception ex)
diff --git a/SampleApplications/Workshop/Aggregation/Client/Program.cs b/SampleApplications/Workshop/Aggregation/Client/Program.cs
index 27a17c44ce..8e8492eacf 100644
--- a/SampleApplications/Workshop/Aggregation/Client/Program.cs
+++ b/SampleApplications/Workshop/Aggregation/Client/Program.cs
@@ -54,10 +54,10 @@ namespace AggregationClient
try
{
// load the application configuration.
- Task.Run( async () => await application.LoadApplicationConfiguration(false)).Wait();
+ application.LoadApplicationConfiguration(false).Wait();
// check the application certificate.
- Task.Run( async () => await application.CheckApplicationInstanceCertificate(false, 0)).Wait();
+ application.CheckApplicationInstanceCertificate(false, 0).Wait();
// run the application interactively.
Application.Run(new MainForm(application.ApplicationConfiguration));
diff --git a/SampleApplications/Workshop/Aggregation/Server/AggregationNodeManager.cs b/SampleApplications/Workshop/Aggregation/Server/AggregationNodeManager.cs
index 134c7007f8..aa0c4f9e07 100644
--- a/SampleApplications/Workshop/Aggregation/Server/AggregationNodeManager.cs
+++ b/SampleApplications/Workshop/Aggregation/Server/AggregationNodeManager.cs
@@ -1152,18 +1152,15 @@ namespace AggregationServer
try
{
- Task.Run(async () =>
- {
- session = await Opc.Ua.Client.Session.Create(
- m_configuration,
- m_endpoint,
- (context == null),
- sessionName,
- 60000,
- userIdentity,
- preferredLocales);
- }
- ).Wait();
+
+ session = Opc.Ua.Client.Session.Create(
+ m_configuration,
+ m_endpoint,
+ (context == null),
+ sessionName,
+ 60000,
+ userIdentity,
+ preferredLocales).Result;
m_clients.Add(sessionId, session);
diff --git a/SampleApplications/Workshop/Aggregation/Server/Program.cs b/SampleApplications/Workshop/Aggregation/Server/Program.cs
index b50a149125..e3cadb79d0 100644
--- a/SampleApplications/Workshop/Aggregation/Server/Program.cs
+++ b/SampleApplications/Workshop/Aggregation/Server/Program.cs
@@ -46,7 +46,7 @@ namespace AggregationServer
[STAThread]
static void Main()
{
- Task.Run(async () => await MyMain()).Wait();
+ MyMain().Wait();
}
static async Task MyMain()
{
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs b/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
index 5dc3ffdb72..6a987f7563 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
@@ -180,13 +180,11 @@ namespace Opc.Ua
try
{
- Task.Run(async () =>
- {
- await InternalValidate(chain);
- }).Wait();
-
lock (m_lock)
- {
+ {
+
+ InternalValidate(chain).Wait();
+
// add to list of validated certificates.
m_validatedCertificates[certificate.Thumbprint] = certificate;
}
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
index cd4d3c0efd..367900d989 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
@@ -620,7 +620,7 @@ namespace Opc.Ua
X509Certificate2 issuer = null;
X509Certificate2Collection certificates = null;
- Task.Run( async () => certificates = await Enumerate()).Wait();
+ certificates = Enumerate().Result;
foreach (X509Certificate2 certificate in certificates)
{
if (Utils.CompareDistinguishedName(certificate.Subject, crl.Issuer))
diff --git a/Stack/Opc.Ua.Core/Stack/Client/UserIdentity.cs b/Stack/Opc.Ua.Core/Stack/Client/UserIdentity.cs
index 9602276129..14b18e0985 100644
--- a/Stack/Opc.Ua.Core/Stack/Client/UserIdentity.cs
+++ b/Stack/Opc.Ua.Core/Stack/Client/UserIdentity.cs
@@ -62,9 +62,7 @@ namespace Opc.Ua
{
if (certificateId == null) throw new ArgumentNullException("certificateId");
- Task task = certificateId.Find();
- task.Wait();
- X509Certificate2 certificate = task.Result;
+ X509Certificate2 certificate = certificateId.Find().Result;
if (certificate != null)
{
Initialize(certificate);
diff --git a/Stack/Opc.Ua.Core/Stack/Server/ServerBase.cs b/Stack/Opc.Ua.Core/Stack/Server/ServerBase.cs
index d7d5d5c8c8..07f603de92 100644
--- a/Stack/Opc.Ua.Core/Stack/Server/ServerBase.cs
+++ b/Stack/Opc.Ua.Core/Stack/Server/ServerBase.cs
@@ -1275,11 +1275,7 @@ namespace Opc.Ua
// load the instance certificate.
if (configuration.SecurityConfiguration.ApplicationCertificate != null)
{
- Task t = Task.Run(async () =>
- {
- InstanceCertificate = await configuration.SecurityConfiguration.ApplicationCertificate.Find(true);
- });
- t.Wait();
+ InstanceCertificate = configuration.SecurityConfiguration.ApplicationCertificate.Find(true).Result;
}
if (InstanceCertificate == null)
diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/TcpClientChannel.cs b/Stack/Opc.Ua.Core/Stack/Tcp/TcpClientChannel.cs
index 59ba786e61..fa37dde13a 100644
--- a/Stack/Opc.Ua.Core/Stack/Tcp/TcpClientChannel.cs
+++ b/Stack/Opc.Ua.Core/Stack/Tcp/TcpClientChannel.cs
@@ -101,7 +101,7 @@ namespace Opc.Ua.Bindings
if (url == null) throw new ArgumentNullException("url");
if (timeout <= 0) throw new ArgumentException("Timeout must be greater than zero.", "timeout");
- Task t;
+ Task task;
lock (DataLock)
{
if (State != TcpChannelState.Closed)
@@ -127,13 +127,10 @@ namespace Opc.Ua.Bindings
State = TcpChannelState.Connecting;
Socket = new TcpMessageSocket(this, BufferManager, Quotas.MaxBufferSize);
- t = Task.Run(async () =>
- {
- await Socket.BeginConnect(m_via, m_ConnectCallback, operation);
- });
+ task = Socket.BeginConnect(m_via, m_ConnectCallback, operation);
}
- t.Wait();
+ task.Wait();
return m_handshakeOperation;
}
@@ -770,7 +767,7 @@ namespace Opc.Ua.Bindings
{
Utils.Trace("Channel {0}: Scheduled Handshake Starting: TokenId={1}", ChannelId, CurrentToken.TokenId);
- Task t;
+ Task task;
lock (DataLock)
{
// check if renewing a token.
@@ -824,12 +821,9 @@ namespace Opc.Ua.Bindings
State = TcpChannelState.Connecting;
Socket = new TcpMessageSocket(this, BufferManager, Quotas.MaxBufferSize);
- t = Task.Run(async () =>
- {
- await Socket.BeginConnect(m_via, m_ConnectCallback, m_handshakeOperation);
- });
+ task = Socket.BeginConnect(m_via, m_ConnectCallback, m_handshakeOperation);
}
- t.Wait();
+ task.Wait();
}
catch (Exception e)
{