Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,11 @@ dotnet_diagnostic.CA1724.severity =
dotnet_diagnostic.CA2326.severity = none
dotnet_diagnostic.CA2327.severity = none

dotnet_diagnostic.CA5390.severity = none
dotnet_diagnostic.CA5403.severity = none
dotnet_code_quality.CA5390.excluded_symbol_names = Initializers
dotnet_code_quality.CA5403.excluded_symbol_names = Initializers

# TODO Fix as P1:

# CA2213: Disposable fields should be disposed
Expand Down Expand Up @@ -1050,6 +1055,47 @@ dotnet_diagnostic.RCS1266.severity =
#
dotnet_diagnostic.UA_NETStandard_1.severity = none

# Allow public members in fixtures
dotnet_diagnostic.NUnit1028.severity = none

# Use new assert style
dotnet_diagnostic.NUnit2001.severity = suggestion
dotnet_diagnostic.NUnit2002.severity = suggestion
dotnet_diagnostic.NUnit2003.severity = suggestion
dotnet_diagnostic.NUnit2004.severity = suggestion
dotnet_diagnostic.NUnit2005.severity = suggestion
dotnet_diagnostic.NUnit2006.severity = suggestion
dotnet_diagnostic.NUnit2010.severity = suggestion
dotnet_diagnostic.NUnit2015.severity = suggestion
dotnet_diagnostic.NUnit2016.severity = suggestion
dotnet_diagnostic.NUnit2017.severity = suggestion
dotnet_diagnostic.NUnit2018.severity = suggestion
dotnet_diagnostic.NUnit2019.severity = suggestion
dotnet_diagnostic.NUnit2027.severity = suggestion
dotnet_diagnostic.NUnit2028.severity = suggestion
dotnet_diagnostic.NUnit2029.severity = suggestion
dotnet_diagnostic.NUnit2030.severity = suggestion
dotnet_diagnostic.NUnit2031.severity = suggestion
dotnet_diagnostic.NUnit2032.severity = suggestion
dotnet_diagnostic.NUnit2033.severity = suggestion
dotnet_diagnostic.NUnit2034.severity = suggestion
dotnet_diagnostic.NUnit2035.severity = suggestion
dotnet_diagnostic.NUnit2035.severity = suggestion
dotnet_diagnostic.NUnit2036.severity = suggestion
dotnet_diagnostic.NUnit2037.severity = suggestion
dotnet_diagnostic.NUnit2038.severity = suggestion
dotnet_diagnostic.NUnit2039.severity = suggestion
dotnet_diagnostic.NUnit2045.severity = silent
dotnet_diagnostic.NUnit2048.severity = suggestion
dotnet_diagnostic.NUnit2049.severity = suggestion
dotnet_diagnostic.NUnit2051.severity = suggestion
dotnet_diagnostic.NUnit2052.severity = suggestion
dotnet_diagnostic.NUnit2053.severity = suggestion
dotnet_diagnostic.NUnit2054.severity = suggestion
dotnet_diagnostic.NUnit2055.severity = suggestion
dotnet_diagnostic.NUnit2056.severity = silent
dotnet_diagnostic.NUnit2057.severity = suggestion

# exclude generated code

[**/Generated/*.cs]
Expand Down
2 changes: 1 addition & 1 deletion common.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<AnalysisMode>all</AnalysisMode>
<AnalysisModeStyle>default</AnalysisModeStyle>
</PropertyGroup>
<ItemGroup Condition="$(NO_RCS) == ''">
<ItemGroup Condition="'$(NoRoslynatorAnalzers)' == ''">
<PackageReference Include="Roslynator.Analyzers" PrivateAssets="All" Version="4.15.0" />
<PackageReference Include="Roslynator.Formatting.Analyzers" PrivateAssets="All" Version="4.15.0" />
</ItemGroup>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<PackageReference Include="Technosoftware.UaSolutions.UaBindings.Https" Version="5.0.0-rc" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Technosoftware.UaSolutions.UaUtilities" Version="5.0.0-rc" />
<PackageReference Include="Technosoftware.UaSolutions.UaCore" Version="5.0.0-rc" />
<PackageReference Include="Technosoftware.UaSolutions.UaConfiguration" Version="5.0.0-rc" />
Expand Down
43 changes: 22 additions & 21 deletions reference/SampleCompany/ReferenceClient/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Opc.Ua;
using Technosoftware.UaClient;
using Technosoftware.UaConfiguration;
using Technosoftware.UaUtilities;
using SampleCompany.Common;
#endregion Using Directives

Expand Down Expand Up @@ -50,41 +51,41 @@ public static async Task Main(string[] args)
);

#region License validation
//const string licenseData =
// @"";
//bool licensed = Technosoftware.UaClient.LicenseHandler.Validate(licenseData);
//if (!licensed)
//{
// Console.WriteLine("WARNING: No valid license applied.");
//}

string licensedString = $" Licensed Product : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedProduct}";
const string licenseData =
@"";
bool licensed = LicenseHandler.Instance.Validate(Technosoftware.UaUtilities.ApplicationType.Client, licenseData);
if (!licensed)
{
Console.WriteLine("WARNING: No valid license applied.");
}

string licensedString = $" Licensed Product : {LicenseHandler.Instance.LicensedProduct}";
Console.WriteLine(licensedString);
licensedString = $" Licensed Features : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedFeatures}";
licensedString = $" Licensed Features : {LicenseHandler.Instance.LicensedFeatures}";
Console.WriteLine(licensedString);
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (LicenseHandler.Instance.IsEvaluation)
{
licensedString = $" Evaluation expires at: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDate}";
licensedString = $" Evaluation expires at: {LicenseHandler.Instance.LicenseExpirationDate}";
Console.WriteLine(licensedString);
licensedString = $" Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDays}";
licensedString = $" Days until Expiration: {LicenseHandler.Instance.LicenseExpirationDays}";
Console.WriteLine(licensedString);
}
licensedString = $" Support Included : {Technosoftware.UaUtilities.Licensing.LicenseHandler.Support}";
licensedString = $" Support Included : {LicenseHandler.Instance.Support}";
Console.WriteLine(licensedString);
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.Support != Technosoftware.UaUtilities.Licensing.SupportType.None)
if (LicenseHandler.Instance.Support != Technosoftware.UaUtilities.SupportType.None)
{
licensedString = $" Support expire at : {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDate}";
licensedString = $" Support expire at : {LicenseHandler.Instance.SupportExpirationDate}";
Console.WriteLine(licensedString);
licensedString = $" Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDays}";
licensedString = $" Days until Expiration: {LicenseHandler.Instance.SupportExpirationDays}";
Console.WriteLine(licensedString);
}
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (LicenseHandler.Instance.IsEvaluation)
{
licensedString = $" Evaluation Period : {Technosoftware.UaUtilities.Licensing.LicenseHandler.EvaluationPeriod} minutes.";
licensedString = $" Evaluation Period : {LicenseHandler.Instance.EvaluationPeriod} minutes.";
Console.WriteLine(licensedString);
}

if (!Technosoftware.UaUtilities.Licensing.LicenseHandler.IsLicensed && !Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (!LicenseHandler.Instance.IsLicensed && !LicenseHandler.Instance.IsEvaluation)
{
Console.WriteLine("ERROR: No valid license applied.");
}
Expand Down Expand Up @@ -315,7 +316,7 @@ public static async Task Main(string[] args)
var application = new ApplicationInstance(telemetry)
{
ApplicationName = applicationName,
ApplicationType = ApplicationType.Client,
ApplicationType = Opc.Ua.ApplicationType.Client,
ConfigSectionName = configSectionName,
CertificatePasswordProvider = passwordProvider
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Company>SampleCompany</Company>
<Product>SampleCompany ReferenceClient</Product>
<Description>SampleCompany ReferenceClient</Description>
<Copyright>Copyright © 2018 - 2025 SampleCompany</Copyright>
<Copyright>Copyright © 2018 - 2026 SampleCompany</Copyright>
</PropertyGroup>
<ItemGroup>
<Compile
Expand All @@ -21,9 +21,10 @@
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.15.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
Expand Down
34 changes: 0 additions & 34 deletions reference/SampleCompany/ReferenceServer/Dockerfile

This file was deleted.

39 changes: 20 additions & 19 deletions reference/SampleCompany/ReferenceServer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Opc.Ua;
using Technosoftware.UaUtilities;
using SampleCompany.Common;
using SampleCompany.NodeManagers;
using SampleCompany.ReferenceServer;
Expand All @@ -38,41 +39,41 @@ public static async Task<int> Main(string[] args)
Console.WriteLine("OPC UA Console Reference Server");

#region License validation
//const string licenseData =
// @"";
//bool licensed = Technosoftware.UaServer.LicenseHandler.Validate(licenseData);
//if (!licensed)
//{
// Console.WriteLine("WARNING: No valid license applied.");
//}
const string licenseData =
@"";
bool licensed = LicenseHandler.Instance.Validate(Technosoftware.UaUtilities.ApplicationType.Server, licenseData);
if (!licensed)
{
Console.WriteLine("WARNING: No valid license applied.");
}

string licensedString = $" Licensed Product : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedProduct}";
string licensedString = $" Licensed Product : {LicenseHandler.Instance.LicensedProduct}";
Console.WriteLine(licensedString);
licensedString = $" Licensed Features : {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicensedFeatures}";
licensedString = $" Licensed Features : {LicenseHandler.Instance.LicensedFeatures}";
Console.WriteLine(licensedString);
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (LicenseHandler.Instance.IsEvaluation)
{
licensedString = $" Evaluation expires at: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDate}";
licensedString = $" Evaluation expires at: {LicenseHandler.Instance.LicenseExpirationDate}";
Console.WriteLine(licensedString);
licensedString = $" Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.LicenseExpirationDays}";
licensedString = $" Days until Expiration: {LicenseHandler.Instance.LicenseExpirationDays}";
Console.WriteLine(licensedString);
}
licensedString = $" Support Included : {Technosoftware.UaUtilities.Licensing.LicenseHandler.Support}";
licensedString = $" Support Included : {LicenseHandler.Instance.Support}";
Console.WriteLine(licensedString);
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.Support != Technosoftware.UaUtilities.Licensing.SupportType.None)
if (LicenseHandler.Instance.Support != Technosoftware.UaUtilities.SupportType.None)
{
licensedString = $" Support expire at : {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDate}";
licensedString = $" Support expire at : {LicenseHandler.Instance.SupportExpirationDate}";
Console.WriteLine(licensedString);
licensedString = $" Days until Expiration: {Technosoftware.UaUtilities.Licensing.LicenseHandler.SupportExpirationDays}";
licensedString = $" Days until Expiration: {LicenseHandler.Instance.SupportExpirationDays}";
Console.WriteLine(licensedString);
}
if (Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (LicenseHandler.Instance.IsEvaluation)
{
licensedString = $" Evaluation Period : {Technosoftware.UaUtilities.Licensing.LicenseHandler.EvaluationPeriod} minutes.";
licensedString = $" Evaluation Period : {LicenseHandler.Instance.EvaluationPeriod} minutes.";
Console.WriteLine(licensedString);
}

if (!Technosoftware.UaUtilities.Licensing.LicenseHandler.IsLicensed && !Technosoftware.UaUtilities.Licensing.LicenseHandler.IsEvaluation)
if (!LicenseHandler.Instance.IsLicensed && !LicenseHandler.Instance.IsEvaluation)
{
Console.WriteLine("ERROR: No valid license applied.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
<Company>SampleCompany</Company>
<Product>SampleCompany ReferenceServer</Product>
<Description>SampleCompany ReferenceServer</Description>
<Copyright>Copyright © 2018 - 2025 SampleCompany</Copyright>
<Copyright>Copyright © 2018 - 2026 SampleCompany</Copyright>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.15.0" />
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.15.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
Expand Down
7 changes: 0 additions & 7 deletions reference/SampleCompany/ReferenceServer/dockerbuild.bat

This file was deleted.

3 changes: 0 additions & 3 deletions reference/SampleCompany/ReferenceServer/dockerbuild.sh

This file was deleted.

6 changes: 0 additions & 6 deletions reference/SampleCompany/ReferenceServer/dockerrun.bat

This file was deleted.

7 changes: 0 additions & 7 deletions reference/SampleCompany/ReferenceServer/dockerrun.sh

This file was deleted.

7 changes: 0 additions & 7 deletions reference/SampleCompany/ReferenceServer/dockerrunghcr.bat

This file was deleted.

8 changes: 0 additions & 8 deletions reference/SampleCompany/ReferenceServer/dockerrunghcr.sh

This file was deleted.

Loading
Loading