Merge pull request #2670 from OPCFoundation/master

Merge main for June release

.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-11"
+        mac = "macOS-13"
     }
 }
 else {

.azurepipelines/get-version.ps1

@@ -10,7 +10,7 @@
 try {
     # Try install tool
     # Note: Keep Version 3.6.133, it is known working for 4 digit versioning 
-    & dotnet @("tool", "install", "--tool-path", "./tools", "--version", "3.6.133", "--framework", "net60", "nbgv") 2>&1 
+    & dotnet @("tool", "install", "--tool-path", "./tools", "--version", "3.6.139", "--framework", "net60", "nbgv") 2>&1 
 
     $props = (& ./tools/nbgv  @("get-version", "-f", "json")) | ConvertFrom-Json
     if ($LastExitCode -ne 0) {

.azurepipelines/preview.yml

@@ -70,6 +70,7 @@ jobs:
       command: restore
       projects: 'UA Core Library.sln'
       arguments: '--configuration ${{parameters.config}}'
+      restoreArguments: '--disable-parallel'
   - task: DotNetCoreCLI@2
     displayName: Build ${{parameters.config}}
     inputs:
@@ -130,11 +131,6 @@ jobs:
       script: |
         NuGetKeyVaultSignTool sign $(Build.ArtifactStagingDirectory)/**/OPCFoundation.*.nupkg --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --timestamp-digest sha256 --azure-key-vault-url "$(SigningVaultURL)" --azure-key-vault-client-id "$(SigningClientId)" --azure-key-vault-tenant-id "$(SigningTenantId)" --azure-key-vault-client-secret "$(SigningClientSecret)" --azure-key-vault-certificate "$(SigningCertName)" 
         NuGetKeyVaultSignTool sign $(Build.ArtifactStagingDirectory)/**/OPCFoundation.*.snupkg --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --timestamp-digest sha256 --azure-key-vault-url "$(SigningVaultURL)" --azure-key-vault-client-id "$(SigningClientId)" --azure-key-vault-tenant-id "$(SigningTenantId)" --azure-key-vault-client-secret "$(SigningClientSecret)" --azure-key-vault-certificate "$(SigningCertName)" 
-  - task: PublishPipelineArtifact@1
-    displayName: 'Publish Artifacts'
-    inputs:
-      path: $(Build.ArtifactStagingDirectory)
-      artifact: 'opcua_${{parameters.config}}_$(NBGV_Version)_$(NBGV_NugetPackageVersion)'
   - ${{ if eq(parameters.upload, 'True') }}:
     - task: NuGetCommand@2
       displayName: Upload Nuget Preview
@@ -144,3 +140,13 @@ jobs:
         nuGetFeedType: 'internal'
         publishVstsFeed: '$(VSTSFEED)'
         allowPackageConflicts: true
+  - task: CmdLine@2
+    displayName: 'Remove Quickstarts.Servers'
+    inputs:
+      script: |
+        del /q /s $(Build.ArtifactStagingDirectory)\OPCFoundation.NetStandard.Opc.Ua.Quickstarts.Servers.*.*nupkg 
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Artifacts'
+    inputs:
+      path: $(Build.ArtifactStagingDirectory)
+      artifact: 'opcua_${{parameters.config}}_$(NBGV_Version)_$(NBGV_NugetPackageVersion)'

.azurepipelines/signlistDebug.txt

@@ -1,42 +1,57 @@
 Stack\Opc.Ua.Core\bin\Debug\netstandard2.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Debug\netstandard2.1\Opc.Ua.Core.dll
+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.Bindings.Https\bin\Debug\netcoreapp3.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
+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.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.ComplexTypes\bin\Debug\netstandard2.1\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.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.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.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.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.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

.azurepipelines/signlistRelease.txt

@@ -1,42 +1,57 @@
 Stack\Opc.Ua.Core\bin\Release\netstandard2.0\Opc.Ua.Core.dll
 Stack\Opc.Ua.Core\bin\Release\netstandard2.1\Opc.Ua.Core.dll
+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.Bindings.Https\bin\Release\netcoreapp3.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
+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.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.ComplexTypes\bin\Release\netstandard2.1\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.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.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.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.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.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

Applications/ConsoleReferenceClient/ConsoleReferenceClient.csproj

@@ -28,7 +28,7 @@
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
   </ItemGroup>
 

Applications/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup>

Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj

@@ -7,7 +7,7 @@
     <PackageId>ConsoleReferenceServer</PackageId>
     <Company>OPC Foundation</Company>
     <Description>.NET Console Reference Server</Description>
-    <Copyright>Copyright © 2004-2023 OPC Foundation, Inc</Copyright>
+    <Copyright>Copyright © 2004-2024 OPC Foundation, Inc</Copyright>
     <RootNamespace>Quickstarts</RootNamespace>
     <UserSecretsId>46345736-a30f-4466-b3bb-42548ecfaacc</UserSecretsId>
   </PropertyGroup>
@@ -37,7 +37,7 @@
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
   </ItemGroup>
 

Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup>

Applications/Quickstarts.Servers/Quickstarts.Servers.csproj

@@ -9,7 +9,7 @@
     <Description>OPC UA Quickstarts Servers Class Library</Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <NoWarn>CS1591;CS1573;RCS1139</NoWarn>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

Applications/ReferenceServer/Reference Server.csproj

@@ -165,7 +165,7 @@
       <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File">
-      <Version>5.0.0</Version>
+      <Version>6.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

Docs/PlatformBuild.md

@@ -40,13 +40,17 @@ Currently the released Nuget packages support a wide variety of .NET platforms:
 The following .NET versions are currently supported by the class libraries
 - .NET Standard 2.0
 - .NET Standard 2.1
+- .NET Framework 4.7.2 
 - .NET Framework 4.8 *
 - .NET 6.0 *
 - .NET 8.0 **
 
 The following platform is deprecated but can still be built and tested:
 - .NET Framework 4.6.2
 
+Limitations:
+- .NET Standard 2.0 and .NET Framework 4.6.2 has no support for the complex types library, as it requires netcoreapp2.1 which is end of life. Similarly there will net be support for ECC profiles due to the missing ECC support.
+
 To reduce the ci build overhead and the number of tests to be run in Visual Studio, only the tagged versions (* and **) are part of a qualifying ci build to pass a pull request. 
 All other platforms are only tested in weekly scheduled or manual ci builds.
 
@@ -56,7 +60,7 @@ Another option is to test run such a custom target in a command window with a ba
 ```xml
 <!-- 
   Uncomment the following lines to test a custom test target 
-  supported values: net462, netstandard2.0, netstandard2.1, net48, net6.0, net8.0
+  supported values: net462, netstandard2.0, netstandard2.1, net472, net48, net6.0, net8.0
  -->
 
   <PropertyGroup>

Fuzzing/Encoders/Fuzz.Tools/Encoders.Fuzz.Tools.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
   </ItemGroup>