Integration of 1.5.378 preview nugets (#672)

* Pass Telemetry context
* Update all calls to obsolete methods
* target net 10

---------

Co-authored-by: Roman Ettlinger <[email protected]>

Author: marcschier

.azurepipelines/ci.yml

@@ -8,7 +8,7 @@ jobs:
 - job: buildprep
   displayName: Prepare Build Jobs
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-2022'
   variables:
     DOTNET_CLI_TELEMETRY_OPTOUT: true
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -31,7 +31,12 @@ jobs:
   - task: NuGetAuthenticate@1
   - task: NuGetToolInstaller@1
     inputs:
-      versionSpec: '>=5.8.x'
+      versionSpec: '>=7.0.x'
+  - task: UseDotNet@2
+    displayName: 'Install .NET 10.0'
+    inputs:
+      packageType: 'sdk'
+      version: '10.0.x'
   - task: DotNetCoreCLI@2
     displayName: Release Restore
     inputs:

.azurepipelines/get-matrix.ps1

@@ -45,7 +45,7 @@ if ($AgentTable -eq $null -or $AgentTable.Count -eq 0)
     $agents = @{
         windows = "windows-2022"
         linux = "ubuntu-22.04"
-        mac = "macOS-13"
+        mac = "macOS-15"
     }
 }
 else {

.azurepipelines/sln.yml

@@ -8,9 +8,14 @@ jobs:
     vmImage: 'windows-2022'
   steps:
   - task: NuGetAuthenticate@1
+  - task: UseDotNet@2
+    displayName: 'Install .NET 10.0'
+    inputs:
+      packageType: 'sdk'
+      version: '10.0.x'
   - task: NuGetToolInstaller@1
     inputs:
-      versionSpec: '>=5.8.x'
+      versionSpec: '>=7.0.x'
   - task: NuGetCommand@2
     displayName: Restore Release
     inputs:

.editorconfig

@@ -578,6 +578,9 @@ dotnet_diagnostic.CA1859.severity = silent
 # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA1861.severity = silent
 
+# CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.CA1848.severity = suggestion
+
 [**/Generated/*.cs]
 generated_code = true
 dotnet_diagnostic.severity = none

.github/workflows/codeql-analysis.yml

@@ -48,10 +48,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Setup .NET
+    - name: Set up .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '6.x' # SDK Version to use;
+        dotnet-version: '10.x'
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe

Samples/Client.Net4/Program.cs

@@ -29,13 +29,29 @@
 
 using System;
 using System.Windows.Forms;
-using Opc.Ua.Configuration;
+using Microsoft.Extensions.Logging;
 using Opc.Ua.Client.Controls;
+using Opc.Ua.Configuration;
 
 namespace Opc.Ua.Sample
 {
+    public sealed class ConsoleTelemetry : TelemetryContextBase
+    {
+        public ConsoleTelemetry()
+        : base(
+            Microsoft.Extensions.Logging.LoggerFactory.Create(builder =>
+            {
+                builder.SetMinimumLevel(LogLevel.Information);
+                builder.AddConsole();
+            })
+            )
+        {
+        }
+    }
     static class Program
     {
+        private static readonly ITelemetryContext m_telemetry = new ConsoleTelemetry();
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
@@ -46,7 +62,7 @@ static void Main()
             Application.SetCompatibleTextRenderingDefault(false);
 
             ApplicationInstance.MessageDlg = new ApplicationMessageDlg();
-            ApplicationInstance application = new ApplicationInstance();
+            ApplicationInstance application = new ApplicationInstance(m_telemetry);
             application.ApplicationName = "UA Sample Client";
             application.ApplicationType = ApplicationType.ClientAndServer;
             application.ConfigSectionName = "Opc.Ua.SampleClient";
@@ -66,11 +82,11 @@ static void Main()
                 application.StartAsync(new SampleServer()).Wait();
 
                 // run the application interactively.
-                Application.Run(new SampleClientForm(application, null, application.ApplicationConfiguration));
+                Application.Run(new SampleClientForm(application, null, application.ApplicationConfiguration, m_telemetry));
             }
             catch (Exception e)
             {
-                ExceptionDlg.Show(application.ApplicationName, e);
+                ExceptionDlg.Show(m_telemetry, application.ApplicationName, e);
             }
         }
     }

Samples/Client.Net4/SampleClientForm.cs

@@ -2,7 +2,7 @@
  * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -11,7 +11,7 @@
  * copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following
  * conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
@@ -45,9 +45,10 @@ public SampleClientForm()
         public SampleClientForm(
             ApplicationInstance application,
             ClientForm masterForm,
-            ApplicationConfiguration configuration)
+            ApplicationConfiguration configuration,
+            ITelemetryContext telemetry)
         :
-            base(configuration.CreateMessageContext(), application, masterForm, configuration)
+            base(configuration.CreateMessageContext(), application, masterForm, configuration, telemetry)
         {
             InitializeComponent();
 
@@ -71,7 +72,7 @@ void CertificateValidator_CertificateValidation(CertificateValidator validator,
             }
             catch (Exception exception)
             {
-                GuiUtils.HandleException(this.Text, MethodBase.GetCurrentMethod(), exception);
+                GuiUtils.HandleException(m_telemetry, this.Text, MethodBase.GetCurrentMethod(), exception);
             }
         }
     }

Samples/Client.Net4/UA Sample Client.csproj

@@ -137,10 +137,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>9.0.8</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.377.21</Version>
+      <Version>1.5.378.11-preview</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.4</Version>

Samples/ClientControls.Net4/Browse/AttributeListCtrl.cs

@@ -78,6 +78,7 @@ public async Task InitializeAsync(ISession session, ExpandedNodeId nodeId, Cance
         {
             ItemsLV.Items.Clear();
             m_session = session;
+            Telemetry = session?.MessageContext?.Telemetry;
 
             if (m_session == null)
             {
@@ -414,7 +415,7 @@ protected override async Task UpdateItemAsync(ListViewItem listItem, object item
             }
             catch (Exception exception)
             {
-                GuiUtils.HandleException(this.Text, MethodBase.GetCurrentMethod(), exception);
+                GuiUtils.HandleException(Telemetry, this.Text, MethodBase.GetCurrentMethod(), exception);
             }
         }
         #endregion

Samples/ClientControls.Net4/Browse/BrowseListCtrl.cs

@@ -72,6 +72,7 @@ public async Task InitializeAsync(ISession session, ExpandedNodeId nodeId, Cance
         {
             ItemsLV.Items.Clear();
             m_session = session;
+            Telemetry = session?.MessageContext?.Telemetry;
 
             if (m_session == null)
             {
@@ -152,7 +153,7 @@ protected override async Task UpdateItemAsync(ListViewItem listItem, object item
             }
             catch (Exception exception)
             {
-                GuiUtils.HandleException(this.Text, MethodBase.GetCurrentMethod(), exception);
+                GuiUtils.HandleException(m_session?.MessageContext?.Telemetry, this.Text, MethodBase.GetCurrentMethod(), exception);
             }
         }
         #endregion