Skip to content

Commit f5d00d9

Browse files
mregenmregen
authored
Merge pull request #2881 from OPCFoundation/main374releaseconflict
Merge develop/main374 into release/1.5.374
2 parents 0b23e5f + 8ea1aa4 commit f5d00d9

File tree

123 files changed

+3014
-1161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3014
-1161
lines changed

‎.azurepipelines/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ jobs:
3333
- task: NuGetToolInstaller@1
3434
inputs:
3535
versionSpec: '>=5.8.x'
36+
- task: UseDotNet@2
37+
displayName: 'Install .NET 9.0'
38+
inputs:
39+
packageType: 'sdk'
40+
version: '9.0.x'
3641
- task: PowerShell@2
3742
displayName: Versioning
3843
inputs:

‎.azurepipelines/get-version.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
try {
1111
# Try install tool
12-
# Note: Keep Version 3.6.143, it is known working for 4 digit versioning
13-
& dotnet @("tool", "install", "--tool-path", "./tools", "--version", "3.6.143", "--framework", "net60", "nbgv") 2>&1
12+
# Note: Keep Version 3.6.146, it is known working for 4 digit versioning
13+
& dotnet @("tool", "install", "--tool-path", "./tools", "--version", "3.6.146", "--framework", "net60", "nbgv") 2>&1
1414

1515
$props = (& ./tools/nbgv @("get-version", "-f", "json")) | ConvertFrom-Json
1616
if ($LastExitCode -ne 0) {

‎.azurepipelines/preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
value: '.azurepipelines/signlist${{parameters.config}}.txt'
3535
steps:
3636
- task: UseDotNet@2
37-
displayName: 'Install .NET 8.0'
37+
displayName: 'Install .NET 9.0'
3838
inputs:
3939
packageType: 'sdk'
40-
version: '8.0.x'
40+
version: '9.0.x'
4141
includePreviewVersions: false
4242
- task: DownloadSecureFile@1
4343
name: strongnamefile

‎.azurepipelines/signlistDebug.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,66 @@ Stack\Opc.Ua.Core\bin\Debug\net472\Opc.Ua.Core.dll
44
Stack\Opc.Ua.Core\bin\Debug\net48\Opc.Ua.Core.dll
55
Stack\Opc.Ua.Core\bin\Debug\net6.0\Opc.Ua.Core.dll
66
Stack\Opc.Ua.Core\bin\Debug\net8.0\Opc.Ua.Core.dll
7+
Stack\Opc.Ua.Core\bin\Debug\net9.0\Opc.Ua.Core.dll
78
Stack\Opc.Ua.Bindings.Https\bin\Debug\netstandard2.0\Opc.Ua.Bindings.Https.dll
89
Stack\Opc.Ua.Bindings.Https\bin\Debug\netstandard2.1\Opc.Ua.Bindings.Https.dll
910
Stack\Opc.Ua.Bindings.Https\bin\Debug\net472\Opc.Ua.Bindings.Https.dll
1011
Stack\Opc.Ua.Bindings.Https\bin\Debug\net48\Opc.Ua.Bindings.Https.dll
1112
Stack\Opc.Ua.Bindings.Https\bin\Debug\net6.0\Opc.Ua.Bindings.Https.dll
1213
Stack\Opc.Ua.Bindings.Https\bin\Debug\net8.0\Opc.Ua.Bindings.Https.dll
14+
Stack\Opc.Ua.Bindings.Https\bin\Debug\net9.0\Opc.Ua.Bindings.Https.dll
1315
Libraries\Opc.Ua.Server\bin\Debug\netstandard2.0\Opc.Ua.Server.dll
1416
Libraries\Opc.Ua.Server\bin\Debug\netstandard2.1\Opc.Ua.Server.dll
1517
Libraries\Opc.Ua.Server\bin\Debug\net472\Opc.Ua.Server.dll
1618
Libraries\Opc.Ua.Server\bin\Debug\net48\Opc.Ua.Server.dll
1719
Libraries\Opc.Ua.Server\bin\Debug\net6.0\Opc.Ua.Server.dll
1820
Libraries\Opc.Ua.Server\bin\Debug\net8.0\Opc.Ua.Server.dll
21+
Libraries\Opc.Ua.Server\bin\Debug\net9.0\Opc.Ua.Server.dll
1922
Libraries\Opc.Ua.Client\bin\Debug\netstandard2.0\Opc.Ua.Client.dll
2023
Libraries\Opc.Ua.Client\bin\Debug\netstandard2.1\Opc.Ua.Client.dll
2124
Libraries\Opc.Ua.Client\bin\Debug\net472\Opc.Ua.Client.dll
2225
Libraries\Opc.Ua.Client\bin\Debug\net48\Opc.Ua.Client.dll
2326
Libraries\Opc.Ua.Client\bin\Debug\net6.0\Opc.Ua.Client.dll
2427
Libraries\Opc.Ua.Client\bin\Debug\net8.0\Opc.Ua.Client.dll
28+
Libraries\Opc.Ua.Client\bin\Debug\net9.0\Opc.Ua.Client.dll
2529
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\netstandard2.1\Opc.Ua.Client.ComplexTypes.dll
2630
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net462\Opc.Ua.Client.ComplexTypes.dll
2731
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net472\Opc.Ua.Client.ComplexTypes.dll
2832
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net48\Opc.Ua.Client.ComplexTypes.dll
2933
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net6.0\Opc.Ua.Client.ComplexTypes.dll
3034
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net8.0\Opc.Ua.Client.ComplexTypes.dll
35+
Libraries\Opc.Ua.Client.ComplexTypes\bin\Debug\net9.0\Opc.Ua.Client.ComplexTypes.dll
3136
Libraries\Opc.Ua.Configuration\bin\Debug\netstandard2.0\Opc.Ua.Configuration.dll
3237
Libraries\Opc.Ua.Configuration\bin\Debug\netstandard2.1\Opc.Ua.Configuration.dll
3338
Libraries\Opc.Ua.Configuration\bin\Debug\net472\Opc.Ua.Configuration.dll
3439
Libraries\Opc.Ua.Configuration\bin\Debug\net48\Opc.Ua.Configuration.dll
3540
Libraries\Opc.Ua.Configuration\bin\Debug\net6.0\Opc.Ua.Configuration.dll
3641
Libraries\Opc.Ua.Configuration\bin\Debug\net8.0\Opc.Ua.Configuration.dll
42+
Libraries\Opc.Ua.Configuration\bin\Debug\net9.0\Opc.Ua.Configuration.dll
3743
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\netstandard2.0\Opc.Ua.Gds.Client.Common.dll
3844
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\netstandard2.1\Opc.Ua.Gds.Client.Common.dll
3945
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net472\Opc.Ua.Gds.Client.Common.dll
4046
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net48\Opc.Ua.Gds.Client.Common.dll
4147
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net6.0\Opc.Ua.Gds.Client.Common.dll
4248
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net8.0\Opc.Ua.Gds.Client.Common.dll
49+
Libraries\Opc.Ua.Gds.Client.Common\bin\Debug\net9.0\Opc.Ua.Gds.Client.Common.dll
4350
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\netstandard2.0\Opc.Ua.Gds.Server.Common.dll
4451
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\netstandard2.1\Opc.Ua.Gds.Server.Common.dll
4552
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net472\Opc.Ua.Gds.Server.Common.dll
4653
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net48\Opc.Ua.Gds.Server.Common.dll
4754
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net6.0\Opc.Ua.Gds.Server.Common.dll
4855
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net8.0\Opc.Ua.Gds.Server.Common.dll
56+
Libraries\Opc.Ua.Gds.Server.Common\bin\Debug\net9.0\Opc.Ua.Gds.Server.Common.dll
4957
Libraries\Opc.Ua.Security.Certificates\bin\Debug\netstandard2.0\Opc.Ua.Security.Certificates.dll
5058
Libraries\Opc.Ua.Security.Certificates\bin\Debug\netstandard2.1\Opc.Ua.Security.Certificates.dll
5159
Libraries\Opc.Ua.Security.Certificates\bin\Debug\net472\Opc.Ua.Security.Certificates.dll
5260
Libraries\Opc.Ua.Security.Certificates\bin\Debug\net48\Opc.Ua.Security.Certificates.dll
5361
Libraries\Opc.Ua.Security.Certificates\bin\Debug\net6.0\Opc.Ua.Security.Certificates.dll
5462
Libraries\Opc.Ua.Security.Certificates\bin\Debug\net8.0\Opc.Ua.Security.Certificates.dll
63+
Libraries\Opc.Ua.Security.Certificates\bin\Debug\net9.0\Opc.Ua.Security.Certificates.dll
5564
Libraries\Opc.Ua.PubSub\bin\Debug\netstandard2.1\Opc.Ua.PubSub.dll
5665
Libraries\Opc.Ua.PubSub\bin\Debug\net472\Opc.Ua.PubSub.dll
5766
Libraries\Opc.Ua.PubSub\bin\Debug\net48\Opc.Ua.PubSub.dll
5867
Libraries\Opc.Ua.PubSub\bin\Debug\net6.0\Opc.Ua.PubSub.dll
5968
Libraries\Opc.Ua.PubSub\bin\Debug\net8.0\Opc.Ua.PubSub.dll
69+
Libraries\Opc.Ua.PubSub\bin\Debug\net9.0\Opc.Ua.PubSub.dll

‎.azurepipelines/signlistRelease.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,66 @@ Stack\Opc.Ua.Core\bin\Release\net472\Opc.Ua.Core.dll
44
Stack\Opc.Ua.Core\bin\Release\net48\Opc.Ua.Core.dll
55
Stack\Opc.Ua.Core\bin\Release\net6.0\Opc.Ua.Core.dll
66
Stack\Opc.Ua.Core\bin\Release\net8.0\Opc.Ua.Core.dll
7+
Stack\Opc.Ua.Core\bin\Release\net9.0\Opc.Ua.Core.dll
78
Stack\Opc.Ua.Bindings.Https\bin\Release\netstandard2.0\Opc.Ua.Bindings.Https.dll
89
Stack\Opc.Ua.Bindings.Https\bin\Release\netstandard2.1\Opc.Ua.Bindings.Https.dll
910
Stack\Opc.Ua.Bindings.Https\bin\Release\net472\Opc.Ua.Bindings.Https.dll
1011
Stack\Opc.Ua.Bindings.Https\bin\Release\net48\Opc.Ua.Bindings.Https.dll
1112
Stack\Opc.Ua.Bindings.Https\bin\Release\net6.0\Opc.Ua.Bindings.Https.dll
1213
Stack\Opc.Ua.Bindings.Https\bin\Release\net8.0\Opc.Ua.Bindings.Https.dll
14+
Stack\Opc.Ua.Bindings.Https\bin\Release\net9.0\Opc.Ua.Bindings.Https.dll
1315
Libraries\Opc.Ua.Server\bin\Release\netstandard2.0\Opc.Ua.Server.dll
1416
Libraries\Opc.Ua.Server\bin\Release\netstandard2.1\Opc.Ua.Server.dll
1517
Libraries\Opc.Ua.Server\bin\Release\net472\Opc.Ua.Server.dll
1618
Libraries\Opc.Ua.Server\bin\Release\net48\Opc.Ua.Server.dll
1719
Libraries\Opc.Ua.Server\bin\Release\net6.0\Opc.Ua.Server.dll
1820
Libraries\Opc.Ua.Server\bin\Release\net8.0\Opc.Ua.Server.dll
21+
Libraries\Opc.Ua.Server\bin\Release\net9.0\Opc.Ua.Server.dll
1922
Libraries\Opc.Ua.Client\bin\Release\netstandard2.0\Opc.Ua.Client.dll
2023
Libraries\Opc.Ua.Client\bin\Release\netstandard2.1\Opc.Ua.Client.dll
2124
Libraries\Opc.Ua.Client\bin\Release\net472\Opc.Ua.Client.dll
2225
Libraries\Opc.Ua.Client\bin\Release\net48\Opc.Ua.Client.dll
2326
Libraries\Opc.Ua.Client\bin\Release\net6.0\Opc.Ua.Client.dll
2427
Libraries\Opc.Ua.Client\bin\Release\net8.0\Opc.Ua.Client.dll
28+
Libraries\Opc.Ua.Client\bin\Release\net9.0\Opc.Ua.Client.dll
2529
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\netstandard2.1\Opc.Ua.Client.ComplexTypes.dll
2630
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net462\Opc.Ua.Client.ComplexTypes.dll
2731
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net472\Opc.Ua.Client.ComplexTypes.dll
2832
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net48\Opc.Ua.Client.ComplexTypes.dll
2933
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net6.0\Opc.Ua.Client.ComplexTypes.dll
3034
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net8.0\Opc.Ua.Client.ComplexTypes.dll
35+
Libraries\Opc.Ua.Client.ComplexTypes\bin\Release\net9.0\Opc.Ua.Client.ComplexTypes.dll
3136
Libraries\Opc.Ua.Configuration\bin\Release\netstandard2.0\Opc.Ua.Configuration.dll
3237
Libraries\Opc.Ua.Configuration\bin\Release\netstandard2.1\Opc.Ua.Configuration.dll
3338
Libraries\Opc.Ua.Configuration\bin\Release\net472\Opc.Ua.Configuration.dll
3439
Libraries\Opc.Ua.Configuration\bin\Release\net48\Opc.Ua.Configuration.dll
3540
Libraries\Opc.Ua.Configuration\bin\Release\net6.0\Opc.Ua.Configuration.dll
3641
Libraries\Opc.Ua.Configuration\bin\Release\net8.0\Opc.Ua.Configuration.dll
42+
Libraries\Opc.Ua.Configuration\bin\Release\net9.0\Opc.Ua.Configuration.dll
3743
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\netstandard2.0\Opc.Ua.Gds.Client.Common.dll
3844
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\netstandard2.1\Opc.Ua.Gds.Client.Common.dll
3945
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net472\Opc.Ua.Gds.Client.Common.dll
4046
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net48\Opc.Ua.Gds.Client.Common.dll
4147
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net6.0\Opc.Ua.Gds.Client.Common.dll
4248
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net8.0\Opc.Ua.Gds.Client.Common.dll
49+
Libraries\Opc.Ua.Gds.Client.Common\bin\Release\net9.0\Opc.Ua.Gds.Client.Common.dll
4350
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\netstandard2.0\Opc.Ua.Gds.Server.Common.dll
4451
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\netstandard2.1\Opc.Ua.Gds.Server.Common.dll
4552
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net472\Opc.Ua.Gds.Server.Common.dll
4653
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net48\Opc.Ua.Gds.Server.Common.dll
4754
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net6.0\Opc.Ua.Gds.Server.Common.dll
4855
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net8.0\Opc.Ua.Gds.Server.Common.dll
56+
Libraries\Opc.Ua.Gds.Server.Common\bin\Release\net9.0\Opc.Ua.Gds.Server.Common.dll
4957
Libraries\Opc.Ua.Security.Certificates\bin\Release\netstandard2.0\Opc.Ua.Security.Certificates.dll
5058
Libraries\Opc.Ua.Security.Certificates\bin\Release\netstandard2.1\Opc.Ua.Security.Certificates.dll
5159
Libraries\Opc.Ua.Security.Certificates\bin\Release\net472\Opc.Ua.Security.Certificates.dll
5260
Libraries\Opc.Ua.Security.Certificates\bin\Release\net48\Opc.Ua.Security.Certificates.dll
5361
Libraries\Opc.Ua.Security.Certificates\bin\Release\net6.0\Opc.Ua.Security.Certificates.dll
5462
Libraries\Opc.Ua.Security.Certificates\bin\Release\net8.0\Opc.Ua.Security.Certificates.dll
63+
Libraries\Opc.Ua.Security.Certificates\bin\Release\net9.0\Opc.Ua.Security.Certificates.dll
5564
Libraries\Opc.Ua.PubSub\bin\Release\netstandard2.1\Opc.Ua.PubSub.dll
5665
Libraries\Opc.Ua.PubSub\bin\Release\net472\Opc.Ua.PubSub.dll
5766
Libraries\Opc.Ua.PubSub\bin\Release\net48\Opc.Ua.PubSub.dll
5867
Libraries\Opc.Ua.PubSub\bin\Release\net6.0\Opc.Ua.PubSub.dll
5968
Libraries\Opc.Ua.PubSub\bin\Release\net8.0\Opc.Ua.PubSub.dll
69+
Libraries\Opc.Ua.PubSub\bin\Release\net9.0\Opc.Ua.PubSub.dll

‎.azurepipelines/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
packageType: 'sdk'
4848
version: '6.0.x'
4949
- task: UseDotNet@2
50-
displayName: 'Install .NET 8.0'
50+
displayName: 'Install .NET 9.0'
5151
inputs:
5252
packageType: 'sdk'
53-
version: '8.0.x'
53+
version: '9.0.x'
5454
- task: NuGetToolInstaller@1
5555
inputs:
5656
versionSpec: '>=5.8.x'

‎.azurepipelines/testcc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
packageType: 'sdk'
3131
version: '6.0.x'
3232
- task: UseDotNet@2
33-
displayName: 'Install .NET 8.0'
33+
displayName: 'Install .NET 9.0'
3434
inputs:
3535
packageType: 'sdk'
36-
version: '8.0.x'
36+
version: '9.0.x'
3737
- task: NuGetToolInstaller@1
3838
inputs:
3939
versionSpec: '>=5.8.x'

‎.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,9 @@ dotnet_diagnostic.CA1819.severity =
342342
# CA1721: The property name is confusing given the existence of another method with the same name.
343343
dotnet_diagnostic.CA1721.severity = silent
344344

345+
# CA2014: Do not use stackalloc in loops
346+
dotnet_diagnostic.CA2014.severity = error
347+
345348
# exclude generated code
346349
[**/Generated/*.cs]
347350
generated_code = true

‎.github/workflows/buildandtest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Test .NET 8.0
1+
name: Build and Test .NET 9.0
22

33
on:
44
push:
@@ -22,10 +22,10 @@ jobs:
2222
os: [ubuntu-latest, windows-latest, macOS-latest]
2323
csproj: [Security.Certificates, Core, Server, Client, Client.ComplexTypes, PubSub, Configuration, Gds]
2424
include:
25-
- framework: 'net8.0'
26-
dotnet-version: '8.0.x'
25+
- framework: 'net9.0'
26+
dotnet-version: '9.0.x'
2727
configuration: 'Release'
28-
customtesttarget: net8.0
28+
customtesttarget: net9.0
2929

3030
env:
3131
OS: ${{ matrix.os }}
@@ -65,7 +65,7 @@ jobs:
6565
if: ${{ always() }}
6666

6767
- name: Upload to Codecov
68-
uses: codecov/codecov-action@v4
68+
uses: codecov/codecov-action@v5
6969
with:
7070
name: codecov-umbrella
7171
token: ${{ secrets.CODECOV_TOKEN }}

‎Applications/ConsoleReferenceClient/ConsoleReferenceClient.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
2626
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
27-
<PackageReference Include="Serilog" Version="4.0.1" />
27+
<PackageReference Include="Serilog" Version="4.1.0" />
2828
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
2929
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
3030
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />

‎Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
3535
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
36-
<PackageReference Include="Serilog" Version="4.0.1" />
36+
<PackageReference Include="Serilog" Version="4.1.0" />
3737
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
3838
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
3939
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />

‎Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<!-- Where the application instance certificate is stored (MachineDefault) -->
1515
<ApplicationCertificate>
1616
<StoreType>Directory</StoreType>
17-
<StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>
17+
<StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>
1818
<SubjectName>CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
1919
</ApplicationCertificate>
2020

@@ -77,6 +77,7 @@
7777
<BaseAddresses>
7878
<ua:String>opc.https://localhost:62540/Quickstarts/ReferenceServer</ua:String>
7979
<ua:String>opc.tcp://localhost:62541/Quickstarts/ReferenceServer</ua:String>
80+
<!--<ua:String>https://localhost:62542/Quickstarts/ReferenceServer</ua:String>-->
8081
</BaseAddresses>
8182
<!--
8283
These list the alternate addresses (via firewalls, multiple NICs etc.) that can be
@@ -153,6 +154,7 @@
153154
<!-- <ua:SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256</ua:SecurityPolicyUri> -->
154155
</ua:UserTokenPolicy>
155156
</UserTokenPolicies>
157+
156158
<DiagnosticsEnabled>true</DiagnosticsEnabled>
157159
<!-- Settings for CTT testing -->
158160
<MaxSessionCount>75</MaxSessionCount>
@@ -264,6 +266,7 @@
264266
</OperationLimits>
265267

266268
<AuditingEnabled>true</AuditingEnabled>
269+
<HttpsMutualTls>true</HttpsMutualTls>
267270
</ServerConfiguration>
268271

269272
<Extensions>

‎Applications/Quickstarts.Servers/ReferenceServer/ReferenceServer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public partial class ReferenceServer : ReverseConnectServer
5353
public ITokenValidator TokenValidator { get; set; }
5454

5555
#endregion
56+
5657
#region Overridden Methods
5758
/// <summary>
5859
/// Creates the node managers for the server.
@@ -247,7 +248,7 @@ private void SessionManager_ImpersonateUser(Session session, ImpersonateEventArg
247248
{
248249
VerifyUserTokenCertificate(x509Token.Certificate);
249250
// set AuthenticatedUser role for accepted certificate authentication
250-
args.Identity = new RoleBasedIdentity(new UserIdentity(x509Token),
251+
args.Identity = new RoleBasedIdentity(new UserIdentity(x509Token),
251252
new List<Role>() { Role.AuthenticatedUser });
252253
Utils.LogInfo(Utils.TraceMasks.Security, "X509 Token Accepted: {0}", args.Identity?.DisplayName);
253254

@@ -325,7 +326,7 @@ private IUserIdentity VerifyPassword(UserNameIdentityToken userNameToken)
325326
new LocalizedText(info)));
326327
}
327328
return new RoleBasedIdentity(new UserIdentity(userNameToken),
328-
new List<Role>() { Role.AuthenticatedUser});
329+
new List<Role>() { Role.AuthenticatedUser });
329330
}
330331

331332
/// <summary>

‎Applications/Quickstarts.Servers/SampleNodeManager/DataChangeMonitoredItem.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,18 @@ public Session Session
340340
}
341341
}
342342

343+
/// <summary>
344+
/// The monitored items owner identity.
345+
/// </summary>
346+
public IUserIdentity EffectiveIdentity
347+
{
348+
get
349+
{
350+
ISubscription subscription = m_subscription;
351+
return subscription?.EffectiveIdentity;
352+
}
353+
}
354+
343355
/// <summary>
344356
/// The identifier for the subscription that the monitored item belongs to.
345357
/// </summary>

‎Applications/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Download and install the [OPC UA Compliance Test Tool](https://opcfoundation.org
5959
Note: Access to the UACTT is granted to OPC Foundation Corporate Members.
6060

6161
### UACTT sample configuration
62-
A sample configuration for the UACTT Version [1.04.9.398](https://opcfoundation.org/developer-tools/certification-test-tools/opc-ua-compliance-test-tool-uactt/) can be found in [UAReferenceServer.ctt.xml](../UAReferenceServer.ctt.xml). Originally the reference server was certified only against the **Standard UA Server** profile, the **Method Server Facet** and the **DataAccess Server Facet**, in addition to all security related profiles. During release testing all Conformance Units should be enabled / checked.
62+
A sample configuration for the UACTT Version [1.04.9.398](https://opcfoundation.org/developer-tools/certification-test-tools/opc-ua-compliance-test-tool-uactt/) can be found in [UAReferenceServer.ctt.xml](./UAReferenceServer.ctt.xml). Originally the reference server was certified only against the **Standard UA Server** profile, the **Method Server Facet** and the **DataAccess Server Facet**, in addition to all security related profiles. During release testing all Conformance Units should be enabled / checked.
6363

6464
### Enabling Alarms & Conditions
6565

‎Fuzzing/Encoders/Fuzz.Tests/EncoderTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ public void FuzzGoodTestcases(
6565
FuzzTarget(fuzzableCode, messageEncoder.Testcase);
6666
}
6767

68+
[Theory]
69+
public void FuzzEmptyByteArray(FuzzTargetFunction fuzzableCode)
70+
{
71+
FuzzTarget(fuzzableCode, Array.Empty<byte>());
72+
}
73+
6874
[Theory]
6975
public void FuzzCrashAssets(FuzzTargetFunction fuzzableCode)
7076
{

0 commit comments

Comments
 (0)