From defd048d135392c512bcaf3edc12d5468e6e02cc Mon Sep 17 00:00:00 2001 From: Martin Regen Date: Fri, 28 Jun 2024 11:00:17 +0200 Subject: [PATCH] Fix macOS build, move https client transport back to core and other maintenance, (#2659) - change macOS 11 ci builds to newer ones, macOS 11 is deprecated - fix Opc.Ua.Client EventSource message numbering - bump nerdgit to 3.6.139 - include .NET Standard 2.0 builds back in Nuget packages for client and server (complex type support requires netcoreapp2.1 which is end of life) - include .NET Framework 4.7.2 as lowest supported .NET Framework platform - move https client channel back to core library, as it requires only netstandard2.0 and has no other dependencies. - Opc.Ua.Https is now only needed for a https server with kestrel. - fix security warning for system.private.uri - upload Quickstarts.Servers to the preview feed to allow use in the samples repo and avoid duplicate codebase --- .azurepipelines/get-matrix.ps1 | 2 +- .azurepipelines/get-version.ps1 | 2 +- .azurepipelines/preview.yml | 16 +++++++++++----- .azurepipelines/signlistDebug.txt | 15 +++++++++++++++ .azurepipelines/signlistRelease.txt | 15 +++++++++++++++ .../ConsoleReferencePublisher.csproj | 1 + .../ConsoleReferenceServer.csproj | 2 +- .../ConsoleReferenceSubscriber.csproj | 1 + .../Quickstarts.Servers.csproj | 2 +- Docs/PlatformBuild.md | 6 +++++- .../Opc.Ua.Client/OpcUaClientEventSource.cs | 2 +- Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj | 2 +- .../Opc.Ua.Bindings.Https.csproj | 16 ++-------------- .../Stack/Https/HttpsServiceHost.cs | 5 +++++ .../Stack/Https/HttpsTransportListener.cs | 4 ++++ Stack/Opc.Ua.Core/Opc.Ua.Core.csproj | 6 +++++- .../Stack/Bindings/TransportBindings.cs | 8 ++++++-- .../Stack/Https/HttpsTransportChannel.cs | 2 -- .../Opc.Ua.Configuration.Tests.csproj | 1 + Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj | 1 + .../Opc.Ua.PubSub.Tests.csproj | 1 + Tests/codecoverage.cmd | 2 +- Tests/codecoverage.sh | 2 +- common.props | 5 +++-- targets.props | 8 ++++---- version.props | 4 ++-- 26 files changed, 90 insertions(+), 41 deletions(-) rename Stack/{Opc.Ua.Bindings.Https => Opc.Ua.Core}/Stack/Https/HttpsTransportChannel.cs (99%) diff --git a/.azurepipelines/get-matrix.ps1 b/.azurepipelines/get-matrix.ps1 index 669fca8d6c..c49229f88f 100644 --- a/.azurepipelines/get-matrix.ps1 +++ b/.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 { diff --git a/.azurepipelines/get-version.ps1 b/.azurepipelines/get-version.ps1 index 4e1c732e21..51600fe4dd 100644 --- a/.azurepipelines/get-version.ps1 +++ b/.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) { diff --git a/.azurepipelines/preview.yml b/.azurepipelines/preview.yml index aafb51e28b..ac06f4d705 100644 --- a/.azurepipelines/preview.yml +++ b/.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)' diff --git a/.azurepipelines/signlistDebug.txt b/.azurepipelines/signlistDebug.txt index 5c9998addd..c65a2d4cca 100644 --- a/.azurepipelines/signlistDebug.txt +++ b/.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 diff --git a/.azurepipelines/signlistRelease.txt b/.azurepipelines/signlistRelease.txt index 8a844e3475..824314c07a 100644 --- a/.azurepipelines/signlistRelease.txt +++ b/.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 diff --git a/Applications/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj b/Applications/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj index fd6db35c7d..d4ce14e522 100644 --- a/Applications/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj +++ b/Applications/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj @@ -13,6 +13,7 @@ + diff --git a/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj b/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj index 718d44d212..c94b8bf06a 100644 --- a/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj +++ b/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj @@ -7,7 +7,7 @@ ConsoleReferenceServer OPC Foundation .NET Console Reference Server - Copyright © 2004-2023 OPC Foundation, Inc + Copyright © 2004-2024 OPC Foundation, Inc Quickstarts 46345736-a30f-4466-b3bb-42548ecfaacc diff --git a/Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj b/Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj index 51ade0d665..b6908d4800 100644 --- a/Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj +++ b/Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj @@ -13,6 +13,7 @@ + diff --git a/Applications/Quickstarts.Servers/Quickstarts.Servers.csproj b/Applications/Quickstarts.Servers/Quickstarts.Servers.csproj index 14690411d7..f613862414 100644 --- a/Applications/Quickstarts.Servers/Quickstarts.Servers.csproj +++ b/Applications/Quickstarts.Servers/Quickstarts.Servers.csproj @@ -9,7 +9,7 @@ OPC UA Quickstarts Servers Class Library PackageReference CS1591;CS1573;RCS1139 - false + true true diff --git a/Docs/PlatformBuild.md b/Docs/PlatformBuild.md index 634aeba152..b895fac253 100644 --- a/Docs/PlatformBuild.md +++ b/Docs/PlatformBuild.md @@ -40,6 +40,7 @@ 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 ** @@ -47,6 +48,9 @@ The following .NET versions are currently supported by the class libraries 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 diff --git a/Libraries/Opc.Ua.Client/OpcUaClientEventSource.cs b/Libraries/Opc.Ua.Client/OpcUaClientEventSource.cs index adda1a621f..c01e1abfdf 100644 --- a/Libraries/Opc.Ua.Client/OpcUaClientEventSource.cs +++ b/Libraries/Opc.Ua.Client/OpcUaClientEventSource.cs @@ -54,7 +54,7 @@ namespace Opc.Ua.Client private const int SubscriptionStateId = 1; private const int NotificationId = SubscriptionStateId + 1; private const int NotificationReceivedId = NotificationId + 1; - private const int PublishStartId = NotificationId + 1; + private const int PublishStartId = NotificationReceivedId + 1; private const int PublishStopId = PublishStartId + 1; /// diff --git a/Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj b/Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj index cba0c56ec2..d287a1fd39 100644 --- a/Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj +++ b/Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj @@ -2,7 +2,7 @@ Opc.Ua.PubSub - $(LibTargetFrameworks) + $(LibxTargetFrameworks) OPCFoundation.NetStandard.Opc.Ua.PubSub Opc.Ua.PubSub OPC UA PubSub Class Library diff --git a/Stack/Opc.Ua.Bindings.Https/Opc.Ua.Bindings.Https.csproj b/Stack/Opc.Ua.Bindings.Https/Opc.Ua.Bindings.Https.csproj index 73b3dc7811..c06b59084c 100644 --- a/Stack/Opc.Ua.Bindings.Https/Opc.Ua.Bindings.Https.csproj +++ b/Stack/Opc.Ua.Bindings.Https/Opc.Ua.Bindings.Https.csproj @@ -1,4 +1,4 @@ - + true @@ -6,7 +6,7 @@ Opc.Ua.Bindings.Https OPCFoundation.NetStandard.Opc.Ua.Bindings.Https Opc.Ua.Bindings - OPC UA Https Binding Library + OPC UA Https Binding Library for a Opc.Ua.Server. true true @@ -38,18 +38,6 @@ - - - - - - - - - - - - diff --git a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs index aad624e8ae..f76c18d2ee 100644 --- a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs +++ b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs @@ -4,8 +4,13 @@ - GPL V2: everybody else RCL license terms accompanied with this source code. See http://opcfoundation.org/License/RCL/1.00/ GNU General Public License as published by the Free Software Foundation; + version 2 of the License are accompanied with this source code. See http://opcfoundation.org/License/GPLv2 + This source code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ + using System; using System.Collections.Generic; using System.Security.Cryptography.X509Certificates; diff --git a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportListener.cs b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportListener.cs index 1f1c79f0ba..ea1e5fceb8 100644 --- a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportListener.cs +++ b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportListener.cs @@ -4,6 +4,10 @@ - GPL V2: everybody else RCL license terms accompanied with this source code. See http://opcfoundation.org/License/RCL/1.00/ GNU General Public License as published by the Free Software Foundation; + version 2 of the License are accompanied with this source code. See http://opcfoundation.org/License/GPLv2 + This source code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ using System; diff --git a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj index 2498aa3c4e..280460251c 100644 --- a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj +++ b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj @@ -44,7 +44,7 @@ use latest versions only on .NET 5/6/7/8, otherwise 3.1.x --> - + @@ -74,6 +74,10 @@ + + + + diff --git a/Stack/Opc.Ua.Core/Stack/Bindings/TransportBindings.cs b/Stack/Opc.Ua.Core/Stack/Bindings/TransportBindings.cs index 36acfb737d..35f86ab053 100644 --- a/Stack/Opc.Ua.Core/Stack/Bindings/TransportBindings.cs +++ b/Stack/Opc.Ua.Core/Stack/Bindings/TransportBindings.cs @@ -21,8 +21,12 @@ namespace Opc.Ua.Bindings { static TransportBindings() { - Channels = new TransportChannelBindings(new Type[] { typeof(TcpTransportChannelFactory) }); - Listeners = new TransportListenerBindings(new Type[] { typeof(TcpTransportListenerFactory) }); + Channels = new TransportChannelBindings(new Type[] { + typeof(TcpTransportChannelFactory), + typeof(HttpsTransportChannelFactory), + typeof(OpcHttpsTransportChannelFactory) }); + Listeners = new TransportListenerBindings(new Type[] { + typeof(TcpTransportListenerFactory) }); } /// diff --git a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportChannel.cs b/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs similarity index 99% rename from Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportChannel.cs rename to Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs index 21601552d1..387f224532 100644 --- a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportChannel.cs +++ b/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs @@ -10,7 +10,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - using System; using System.IO; using System.Net; @@ -515,4 +514,3 @@ namespace Opc.Ua.Bindings private static readonly MediaTypeHeaderValue s_mediaTypeHeaderValue = new MediaTypeHeaderValue("application/octet-stream"); } } - diff --git a/Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj b/Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj index 973fbe789f..d1b385b75b 100644 --- a/Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj +++ b/Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj @@ -21,6 +21,7 @@ + diff --git a/Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj b/Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj index 9fd3b5811b..3ae412bb0d 100644 --- a/Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj +++ b/Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj @@ -23,6 +23,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj b/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj index 0ddbba1646..dee35417b5 100644 --- a/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj +++ b/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj @@ -22,6 +22,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Tests/codecoverage.cmd b/Tests/codecoverage.cmd index ecaa7f2e3c..66b9869004 100644 --- a/Tests/codecoverage.cmd +++ b/Tests/codecoverage.cmd @@ -8,7 +8,7 @@ set current-path=%~dp0 rem // remove trailing slash set current-path=%current-path:~0,-1% set build_root=%current-path%\.. -set framework=net6.0 +set framework=net8.0 cd %build_root% diff --git a/Tests/codecoverage.sh b/Tests/codecoverage.sh index e66636f549..8059165ed8 100755 --- a/Tests/codecoverage.sh +++ b/Tests/codecoverage.sh @@ -7,7 +7,7 @@ cd $BUILDROOT rm -r ./CodeCoverage rm -r ./TestResults -dotnet test "UA Core Library.sln" -v n --configuration Release --framework net6.0 --collect:"XPlat Code Coverage" --settings ./Tests/coverlet.runsettings.xml --results-directory ./TestResults +dotnet test "UA Core Library.sln" -v n --configuration Release --framework net8.0 --collect:"XPlat Code Coverage" --settings ./Tests/coverlet.runsettings.xml --results-directory ./TestResults # ensure latest report tool is installed dotnet tool uninstall -g dotnet-reportgenerator-globaltool diff --git a/common.props b/common.props index 3db40bb6b1..d3c770f8d2 100644 --- a/common.props +++ b/common.props @@ -14,10 +14,11 @@ true 7.3 - true - + + all + true diff --git a/targets.props b/targets.props index 2a7262ff73..c3e9f77ebe 100644 --- a/targets.props +++ b/targets.props @@ -118,10 +118,10 @@ net6.0;net48 net8.0 net48;net6.0 - net48;netstandard2.1;net6.0;net8.0 - net48;netstandard2.0;netstandard2.1;net6.0;net8.0 - net48;netstandard2.1;net6.0;net8.0 - net48;netcoreapp3.1;net6.0;net8.0 + net472;net48;netstandard2.0;netstandard2.1;net6.0;net8.0 + net472;net48;netstandard2.0;netstandard2.1;net6.0;net8.0 + net472;net48;netstandard2.1;net6.0;net8.0 + net472;net48;netcoreapp3.1;net6.0;net8.0 diff --git a/version.props b/version.props index f36a2406cd..2b2e2fd1d6 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive