Merge pull request OPCFoundation#2889 from OPCFoundation/develop/main374

Merge main374 in ECC branch
mrsuciu · Dec 8, 2024 · 0777bbd · 0777bbd
2 parents bc0b181 + 5ed73fc
commit 0777bbd
Show file tree

Hide file tree

Showing 105 changed files with 1,816 additions and 687 deletions.
diff --git a/.azurepipelines/ci.yml b/.azurepipelines/ci.yml
@@ -33,6 +33,11 @@ jobs:
   - task: NuGetToolInstaller@1
     inputs:
       versionSpec: '>=5.8.x'
+  - task: UseDotNet@2
+    displayName: 'Install .NET 9.0'
+    inputs:
+      packageType: 'sdk'
+      version: '9.0.x'
   - task: PowerShell@2
     displayName: Versioning
     inputs:

diff --git a/.azurepipelines/preview.yml b/.azurepipelines/preview.yml
@@ -34,10 +34,10 @@ jobs:
     value: '.azurepipelines/signlist${{parameters.config}}.txt'
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET 8.0'
+    displayName: 'Install .NET 9.0'
     inputs:
       packageType: 'sdk'
-      version: '8.0.x'
+      version: '9.0.x'
       includePreviewVersions: false  
   - task: DownloadSecureFile@1
     name: strongnamefile

diff --git a/.azurepipelines/signlistDebug.txt b/.azurepipelines/signlistDebug.txt
@@ -4,56 +4,66 @@ Stack\Opc.Ua.Core\bin\Debug\net472\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Debug\net48\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Debug\net6.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Debug\net8.0\Opc.Ua.Core.dll
+Stack\Opc.Ua.Core\bin\Debug\net9.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\netstandard2.0\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\netstandard2.1\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\net472\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\net48\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\net6.0\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Debug\net8.0\Opc.Ua.Bindings.Https.dll
+Stack\Opc.Ua.Bindings.Https\bin\Debug\net9.0\Opc.Ua.Bindings.Https.dll
 Libraries\Opc.Ua.Server\bin\Debug\netstandard2.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Debug\netstandard2.1\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Debug\net472\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Debug\net48\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Debug\net6.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Debug\net8.0\Opc.Ua.Server.dll
+Libraries\Opc.Ua.Server\bin\Debug\net9.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Client\bin\Debug\netstandard2.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Debug\netstandard2.1\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Debug\net472\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Debug\net48\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Debug\net6.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Debug\net8.0\Opc.Ua.Client.dll
+Libraries\Opc.Ua.Client\bin\Debug\net9.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\netstandard2.1\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net462\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net472\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net48\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net6.0\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net8.0\Opc.Ua.Client.ComplexTypes.dll
+Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net9.0\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\netstandard2.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\netstandard2.1\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\net472\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\net48\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\net6.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Debug\net8.0\Opc.Ua.Configuration.dll
+Libraries\Opc.Ua.Configuration\bin\Debug\net9.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\netstandard2.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\netstandard2.1\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net472\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net48\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net6.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net8.0\Opc.Ua.Gds.Client.Common.dll
+Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net9.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\netstandard2.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\netstandard2.1\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net472\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net48\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net6.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net8.0\Opc.Ua.Gds.Server.Common.dll
+Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net9.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\netstandard2.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\netstandard2.1\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\net472\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\net48\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\net6.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Debug\net8.0\Opc.Ua.Security.Certificates.dll
+Libraries\Opc.Ua.Security.Certificates\bin\Debug\net9.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.PubSub\bin\Debug\netstandard2.1\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Debug\net472\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Debug\net48\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Debug\net6.0\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Debug\net8.0\Opc.Ua.PubSub.dll
+Libraries\Opc.Ua.PubSub\bin\Debug\net9.0\Opc.Ua.PubSub.dll
diff --git a/.azurepipelines/signlistRelease.txt b/.azurepipelines/signlistRelease.txt
@@ -4,56 +4,66 @@ Stack\Opc.Ua.Core\bin\Release\net472\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Release\net48\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Release\net6.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Release\net8.0\Opc.Ua.Core.dll
+Stack\Opc.Ua.Core\bin\Release\net9.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\netstandard2.0\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\netstandard2.1\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\net472\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\net48\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\net6.0\Opc.Ua.Bindings.Https.dll
 Stack\Opc.Ua.Bindings.Https\bin\Release\net8.0\Opc.Ua.Bindings.Https.dll
+Stack\Opc.Ua.Bindings.Https\bin\Release\net9.0\Opc.Ua.Bindings.Https.dll
 Libraries\Opc.Ua.Server\bin\Release\netstandard2.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Release\netstandard2.1\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Release\net472\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Release\net48\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Release\net6.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Server\bin\Release\net8.0\Opc.Ua.Server.dll
+Libraries\Opc.Ua.Server\bin\Release\net9.0\Opc.Ua.Server.dll
 Libraries\Opc.Ua.Client\bin\Release\netstandard2.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Release\netstandard2.1\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Release\net472\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Release\net48\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Release\net6.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client\bin\Release\net8.0\Opc.Ua.Client.dll
+Libraries\Opc.Ua.Client\bin\Release\net9.0\Opc.Ua.Client.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\netstandard2.1\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net462\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net472\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net48\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net6.0\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net8.0\Opc.Ua.Client.ComplexTypes.dll
+Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net9.0\Opc.Ua.Client.ComplexTypes.dll
 Libraries\Opc.Ua.Configuration\bin\Release\netstandard2.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Release\netstandard2.1\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Release\net472\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Release\net48\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Release\net6.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Configuration\bin\Release\net8.0\Opc.Ua.Configuration.dll
+Libraries\Opc.Ua.Configuration\bin\Release\net9.0\Opc.Ua.Configuration.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\netstandard2.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\netstandard2.1\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net472\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net48\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net6.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net8.0\Opc.Ua.Gds.Client.Common.dll
+Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net9.0\Opc.Ua.Gds.Client.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\netstandard2.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\netstandard2.1\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net472\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net48\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net6.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net8.0\Opc.Ua.Gds.Server.Common.dll
+Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net9.0\Opc.Ua.Gds.Server.Common.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\netstandard2.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\netstandard2.1\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\net472\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\net48\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\net6.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.Security.Certificates\bin\Release\net8.0\Opc.Ua.Security.Certificates.dll
+Libraries\Opc.Ua.Security.Certificates\bin\Release\net9.0\Opc.Ua.Security.Certificates.dll
 Libraries\Opc.Ua.PubSub\bin\Release\netstandard2.1\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Release\net472\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Release\net48\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Release\net6.0\Opc.Ua.PubSub.dll
 Libraries\Opc.Ua.PubSub\bin\Release\net8.0\Opc.Ua.PubSub.dll
+Libraries\Opc.Ua.PubSub\bin\Release\net9.0\Opc.Ua.PubSub.dll
diff --git a/.azurepipelines/test.yml b/.azurepipelines/test.yml
@@ -47,10 +47,10 @@ jobs:
       packageType: 'sdk'
       version: '6.0.x'
   - task: UseDotNet@2
-    displayName: 'Install .NET 8.0'
+    displayName: 'Install .NET 9.0'
     inputs:
       packageType: 'sdk'
-      version: '8.0.x'
+      version: '9.0.x'
   - task: NuGetToolInstaller@1
     inputs:
       versionSpec: '>=5.8.x'

diff --git a/.azurepipelines/testcc.yml b/.azurepipelines/testcc.yml
@@ -30,10 +30,10 @@ jobs:
       packageType: 'sdk'
       version: '6.0.x'
   - task: UseDotNet@2
-    displayName: 'Install .NET 8.0'
+    displayName: 'Install .NET 9.0'
     inputs:
       packageType: 'sdk'
-      version: '8.0.x'
+      version: '9.0.x'
   - task: NuGetToolInstaller@1
     inputs:
       versionSpec: '>=5.8.x'

diff --git a/.editorconfig b/.editorconfig
@@ -342,6 +342,9 @@ dotnet_diagnostic.CA1819.severity                                             =
 # CA1721: The property name is confusing given the existence of another method with the same name.
 dotnet_diagnostic.CA1721.severity                                             = silent
 
+# CA2014: Do not use stackalloc in loops
+dotnet_diagnostic.CA2014.severity                                             = error
+
 # exclude generated code
 [**/Generated/*.cs]
 generated_code = true

diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -1,4 +1,4 @@
-name: Build and Test .NET 8.0
+name: Build and Test .NET 9.0
 
 on:
   push:
@@ -22,10 +22,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]    
         csproj: [Security.Certificates, Core, Server, Client, Client.ComplexTypes, PubSub, Configuration, Gds]
         include:
-          - framework: 'net8.0'
-            dotnet-version: '8.0.x'
+          - framework: 'net9.0'
+            dotnet-version: '9.0.x'
             configuration: 'Release'
-            customtesttarget: net8.0
+            customtesttarget: net9.0
 
     env:
       OS: ${{ matrix.os }}

diff --git a/Applications/ConsoleReferenceClient/ConsoleReferenceClient.csproj b/Applications/ConsoleReferenceClient/ConsoleReferenceClient.csproj
@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />

diff --git a/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj b/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj
@@ -29,9 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />

diff --git a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -220,6 +220,7 @@
         <!-- <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri> -->
       </ua:UserTokenPolicy>
     </UserTokenPolicies>
+
     <DiagnosticsEnabled>true</DiagnosticsEnabled>
     <!-- Settings for CTT testing -->
     <MaxSessionCount>75</MaxSessionCount>
@@ -331,6 +332,7 @@
     </OperationLimits>
 
     <AuditingEnabled>true</AuditingEnabled>
+    <HttpsMutualTls>true</HttpsMutualTls>
   </ServerConfiguration>
 
   <Extensions>

diff --git a/Applications/Quickstarts.Servers/ReferenceServer/ReferenceServer.cs b/Applications/Quickstarts.Servers/ReferenceServer/ReferenceServer.cs
@@ -53,6 +53,7 @@ public partial class ReferenceServer : ReverseConnectServer
         public ITokenValidator TokenValidator { get; set; }
 
         #endregion
+
         #region Overridden Methods
         /// <summary>
         /// Creates the node managers for the server.
@@ -247,7 +248,7 @@ private void SessionManager_ImpersonateUser(Session session, ImpersonateEventArg
             {
                 VerifyUserTokenCertificate(x509Token.Certificate);
                 // set AuthenticatedUser role for accepted certificate authentication
-                args.Identity =  new RoleBasedIdentity(new UserIdentity(x509Token),
+                args.Identity = new RoleBasedIdentity(new UserIdentity(x509Token),
                     new List<Role>() { Role.AuthenticatedUser });
                 Utils.LogInfo(Utils.TraceMasks.Security, "X509 Token Accepted: {0}", args.Identity?.DisplayName);
 
@@ -325,7 +326,7 @@ private IUserIdentity VerifyPassword(UserNameIdentityToken userNameToken)
                     new LocalizedText(info)));
             }
             return new RoleBasedIdentity(new UserIdentity(userNameToken),
-                   new List<Role>() { Role.AuthenticatedUser});
+                   new List<Role>() { Role.AuthenticatedUser });
         }
 
         /// <summary>

diff --git a/Applications/Quickstarts.Servers/SampleNodeManager/DataChangeMonitoredItem.cs b/Applications/Quickstarts.Servers/SampleNodeManager/DataChangeMonitoredItem.cs
@@ -340,6 +340,18 @@ public Session Session
             }
         }
 
+        /// <summary>
+        /// The monitored items owner identity.
+        /// </summary>
+        public IUserIdentity EffectiveIdentity
+        {
+            get
+            {
+                ISubscription subscription = m_subscription;
+                return subscription?.EffectiveIdentity;
+            }
+        }
+
         /// <summary>
         /// The identifier for the subscription that the monitored item belongs to.
         /// </summary>

diff --git a/Fuzzing/Encoders/Fuzz.Tests/EncoderTests.cs b/Fuzzing/Encoders/Fuzz.Tests/EncoderTests.cs
@@ -65,6 +65,12 @@ public void FuzzGoodTestcases(
             FuzzTarget(fuzzableCode, messageEncoder.Testcase);
         }
 
+        [Theory]
+        public void FuzzEmptyByteArray(FuzzTargetFunction fuzzableCode)
+        {
+            FuzzTarget(fuzzableCode, Array.Empty<byte>());
+        }
+
         [Theory]
         public void FuzzCrashAssets(FuzzTargetFunction fuzzableCode)
         {

diff --git a/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj b/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit.Console" Version="3.18.3" />

diff --git a/Libraries/Opc.Ua.Client/CoreClientUtils.cs b/Libraries/Opc.Ua.Client/CoreClientUtils.cs
@@ -339,7 +339,7 @@ public static EndpointDescription SelectEndpoint(
         public static Uri GetDiscoveryUrl(string discoveryUrl)
         {
             // needs to add the '/discovery' back onto non-UA TCP URLs.
-            if (discoveryUrl.StartsWith(Utils.UriSchemeHttp, StringComparison.Ordinal))
+            if (Utils.IsUriHttpRelatedScheme(discoveryUrl))
             {
                 if (!discoveryUrl.EndsWith(ConfiguredEndpoint.DiscoverySuffix, StringComparison.OrdinalIgnoreCase))
                 {