GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-16 21:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix macOS build, move https client transport back to core and other maintenance, (#2659)

Browse Source 
- 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
This commit is contained in:
Martin Regen
2024-06-28 11:00:17 +02:00
committed by GitHub
parent f2815bb592
commit defd048d13
26 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.azurepipelines/get-matrix.ps1
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+11 -5
View File
@@ -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
+15
View File
@@ -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
+15
View File
@@ -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/ConsoleReferencePublisher/ConsoleReferencePublisher.csproj
+1
View File
@@ -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
+1 -1
View File
@@ -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>
Applications/ConsoleReferenceSubscriber/ConsoleReferenceSubscriber.csproj
+1
View File
@@ -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
+1 -1
View File
@@ -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>
Docs/PlatformBuild.md
+5 -1
View File
@@ -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
<!--
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>
Libraries/Opc.Ua.Client/OpcUaClientEventSource.cs
+1 -1
View File
@@ -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;
/// <summary>
Libraries/Opc.Ua.PubSub/Opc.Ua.PubSub.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>Opc.Ua.PubSub</AssemblyName>
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
<TargetFrameworks>$(LibxTargetFrameworks)</TargetFrameworks>
<PackageId>OPCFoundation.NetStandard.Opc.Ua.PubSub</PackageId>
<RootNamespace>Opc.Ua.PubSub</RootNamespace>
<Description>OPC UA PubSub Class Library</Description>
Stack/Opc.Ua.Bindings.Https/Opc.Ua.Bindings.Https.csproj
+2 -14
View File
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
@@ -6,7 +6,7 @@
<AssemblyName>Opc.Ua.Bindings.Https</AssemblyName>
<PackageId>OPCFoundation.NetStandard.Opc.Ua.Bindings.Https</PackageId>
<RootNamespace>Opc.Ua.Bindings</RootNamespace>
<Description>OPC UA Https Binding Library</Description>
<Description>OPC UA Https Binding Library for a Opc.Ua.Server.</Description>
<IsPackable>true</IsPackable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
@@ -38,18 +38,6 @@
</Otherwise>
</Choose>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Opc.Ua.Core\Opc.Ua.Core.csproj" />
</ItemGroup>
Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs
+5
View File
@@ -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;
Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportListener.cs
+4
View File
@@ -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;
Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
+5 -1
View File
@@ -44,7 +44,7 @@
use latest versions only on .NET 5/6/7/8, otherwise 3.1.x -->
<When Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
@@ -74,6 +74,10 @@
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472' OR '$(TargetFramework)' == 'net462'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
Stack/Opc.Ua.Core/Stack/Bindings/TransportBindings.cs
+6 -2
View File
@@ -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) });
}
/// <summary>
Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportChannel.cs → Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs
-2
View File
@@ -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");
}
}
Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj
+1
View File
@@ -21,6 +21,7 @@
</PackageReference>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
</ItemGroup>
<ItemGroup>
Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj
+1
View File
@@ -23,6 +23,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
</ItemGroup>
<Choose>
Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj
+1
View File
@@ -22,6 +22,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
</ItemGroup>
<ItemGroup>
Tests/codecoverage.cmd
+1 -1
View File
@@ -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%
Tests/codecoverage.sh
+1 -1
View File
@@ -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
common.props
+3 -2
View File
@@ -14,10 +14,11 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- Highest language version supported by .NET Standard 2.0 and .NET Framework -->
<LangVersion>7.3</LangVersion>
<!--TODO <GenerateDocumentationFile>true</GenerateDocumentationFile>-->
<EnablePackageValidation>true</EnablePackageValidation>
<!-- to check the package validation on a release build, uncomment here -->
<!--<PackageValidationBaselineVersion>1.5.374.1</PackageValidationBaselineVersion>-->
<!--<PackageValidationBaselineVersion>1.5.374.27</PackageValidationBaselineVersion>-->
<NuGetAuditMode>all</NuGetAuditMode>
<NuGetAudit>true</NuGetAudit>
</PropertyGroup>
<PropertyGroup>
targets.props
+4 -4
View File
@@ -118,10 +118,10 @@
<AppTargetFrameworks>net6.0;net48</AppTargetFrameworks>
<AppTargetFramework>net8.0</AppTargetFramework>
<TestsTargetFrameworks>net48;net6.0</TestsTargetFrameworks>
<LibTargetFrameworks>net48;netstandard2.1;net6.0;net8.0</LibTargetFrameworks>
<LibCoreTargetFrameworks>net48;netstandard2.0;netstandard2.1;net6.0;net8.0</LibCoreTargetFrameworks>
<LibxTargetFrameworks>net48;netstandard2.1;net6.0;net8.0</LibxTargetFrameworks>
<HttpsTargetFrameworks>net48;netcoreapp3.1;net6.0;net8.0</HttpsTargetFrameworks>
<LibTargetFrameworks>net472;net48;netstandard2.0;netstandard2.1;net6.0;net8.0</LibTargetFrameworks>
<LibCoreTargetFrameworks>net472;net48;netstandard2.0;netstandard2.1;net6.0;net8.0</LibCoreTargetFrameworks>
<LibxTargetFrameworks>net472;net48;netstandard2.1;net6.0;net8.0</LibxTargetFrameworks>
<HttpsTargetFrameworks>net472;net48;netcoreapp3.1;net6.0;net8.0</HttpsTargetFrameworks>
</PropertyGroup>
</When>
<!-- Visual Studio 2019, supports .NET Framework 4.8 and .NET Core 3.1 -->
version.props
+2 -2
View File
@@ -1,7 +1,7 @@
<Project>
<ItemGroup Condition="$(NBGV_PublicRelease) != 'True' AND '$(CODEQL_RUNNER)' == '' AND '$(Dockerbuild)' != 'true'">
<!-- Note: Keep Version 3.5.119, it is known working for 4 digit versioning -->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
<!-- Note: Keep Version 3.6.139, it is known working for 4 digit versioning -->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>