Skip to content

Commit eeb605b

Browse files
romanettmarcschier
andauthored
Update to 1.05.377 Nuget Packages and use async client calls (#665)
* Update to newest Opc.Ua Nuget Packages * Switch to async client calls --------- Co-authored-by: Marc Schier <[email protected]>
1 parent fdae6cd commit eeb605b

File tree

482 files changed

+9617
-9832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+9617
-9832
lines changed

.editorconfig

Lines changed: 367 additions & 102 deletions
Large diffs are not rendered by default.

Samples/Client.Net4/Program.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
33
*
44
* OPC Foundation MIT License 1.00
5-
*
5+
*
66
* Permission is hereby granted, free of charge, to any person
77
* obtaining a copy of this software and associated documentation
88
* files (the "Software"), to deal in the Software without
@@ -11,7 +11,7 @@
1111
* copies of the Software, and to permit persons to whom the
1212
* Software is furnished to do so, subject to the following
1313
* conditions:
14-
*
14+
*
1515
* The above copyright notice and this permission notice shall be
1616
* included in all copies or substantial portions of the Software.
1717
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
@@ -47,23 +47,23 @@ static void Main()
4747

4848
ApplicationInstance.MessageDlg = new ApplicationMessageDlg();
4949
ApplicationInstance application = new ApplicationInstance();
50-
application.ApplicationName = "UA Sample Client";
51-
application.ApplicationType = ApplicationType.ClientAndServer;
50+
application.ApplicationName = "UA Sample Client";
51+
application.ApplicationType = ApplicationType.ClientAndServer;
5252
application.ConfigSectionName = "Opc.Ua.SampleClient";
5353

5454
try
5555
{
56-
application.LoadApplicationConfiguration(false).Wait();
56+
application.LoadApplicationConfigurationAsync(false).AsTask().GetAwaiter().GetResult();
5757

5858
// check the application certificate.
59-
bool certOK = application.CheckApplicationInstanceCertificates(false).Result;
59+
bool certOK = application.CheckApplicationInstanceCertificatesAsync(false).AsTask().Result;
6060
if (!certOK)
6161
{
6262
throw new Exception("Application instance certificate invalid!");
6363
}
6464

6565
// start the server.
66-
application.Start(new SampleServer()).Wait();
66+
application.StartAsync(new SampleServer()).Wait();
6767

6868
// run the application interactively.
6969
Application.Run(new SampleClientForm(application, null, application.ApplicationConfiguration));

Samples/Client.Net4/SampleClientForm.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public SampleClientForm()
4343
}
4444

4545
public SampleClientForm(
46-
ApplicationInstance application,
47-
ClientForm masterForm,
46+
ApplicationInstance application,
47+
ClientForm masterForm,
4848
ApplicationConfiguration configuration)
4949
:
5050
base(configuration.CreateMessageContext(), application, masterForm, configuration)
@@ -71,7 +71,7 @@ void CertificateValidator_CertificateValidation(CertificateValidator validator,
7171
}
7272
catch (Exception exception)
7373
{
74-
GuiUtils.HandleException(this.Text, MethodBase.GetCurrentMethod(), exception);
74+
GuiUtils.HandleException(this.Text, MethodBase.GetCurrentMethod(), exception);
7575
}
7676
}
7777
}

Samples/Client.Net4/UA Sample Client.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<UseVSHostingProcess>false</UseVSHostingProcess>
3838
<PlatformTarget>AnyCPU</PlatformTarget>
3939
<Prefer32Bit>false</Prefer32Bit>
40+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4041
</PropertyGroup>
4142
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4243
<DebugType>pdbonly</DebugType>
@@ -48,6 +49,7 @@
4849
<UseVSHostingProcess>false</UseVSHostingProcess>
4950
<PlatformTarget>AnyCPU</PlatformTarget>
5051
<Prefer32Bit>false</Prefer32Bit>
52+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5153
</PropertyGroup>
5254
<ItemGroup>
5355
<Reference Include="System" />
@@ -135,10 +137,10 @@
135137
</ItemGroup>
136138
<ItemGroup>
137139
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
138-
<Version>9.0.6</Version>
140+
<Version>9.0.8</Version>
139141
</PackageReference>
140142
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
141-
<Version>1.5.376.244</Version>
143+
<Version>1.5.377.11-preview</Version>
142144
</PackageReference>
143145
<PackageReference Include="System.Net.Http">
144146
<Version>4.3.4</Version>

0 commit comments

Comments
 (0)