Skip to content

Commit faeb581

Browse files
mrsuciumrsuciu
authored
Merge pull request #3096 from OPCFoundation/master
Update to latest dependencies. (#3095)
2 parents 015b962 + ac05ef6 commit faeb581

File tree

15 files changed

+39
-36
lines changed

15 files changed

+39
-36
lines changed

‎Applications/ConsoleReferenceClient/ConsoleReferenceClient.csproj‎

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

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4" />
23+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
2626
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
27-
<PackageReference Include="Serilog" Version="4.2.0" />
27+
<PackageReference Include="Serilog" Version="4.3.0" />
2828
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
2929
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
30-
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
30+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
3131
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
3232
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
3333
</ItemGroup>

‎Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj‎

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

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4" />
32+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
3535
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
36-
<PackageReference Include="Serilog" Version="4.2.0" />
36+
<PackageReference Include="Serilog" Version="4.3.0" />
3737
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
3838
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
39-
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
39+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
4040
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
4141
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
4242
</ItemGroup>

‎Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
<PackageReference Include="NUnit" Version="4.3.2" />
24-
<PackageReference Include="NUnit.Console" Version="3.20.0" />
24+
<PackageReference Include="NUnit.Console" Version="3.20.1" />
2525
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -31,7 +31,7 @@
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
3333
<PackageReference Include="SharpFuzz" Version="2.2.0" />
34-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
34+
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎Libraries/Opc.Ua.Gds.Server.Common/Opc.Ua.Gds.Server.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
40+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

‎Libraries/Opc.Ua.Security.Certificates/Opc.Ua.Security.Certificates.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Choose>
1919
<When Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
2020
<ItemGroup>
21-
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
21+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
2222
</ItemGroup>
2323
</When>
2424
<Otherwise>
@@ -40,17 +40,19 @@
4040
<Choose>
4141
<When Condition="'$(TargetFramework)' == 'net472' OR '$(TargetFramework)' == 'net48'">
4242
<ItemGroup>
43-
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
43+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
44+
<!--- Keep as long as net60 is target, otherwise transient warnings occur-->
4445
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
4546
</ItemGroup>
4647
</When>
4748
<When Condition="'$(TargetFramework)' == 'net9.0'">
4849
<ItemGroup>
49-
<PackageReference Include="System.Formats.Asn1" Version="9.0.4" />
50+
<PackageReference Include="System.Formats.Asn1" Version="9.0.6" />
5051
</ItemGroup>
5152
</When>
5253
<Otherwise>
5354
<ItemGroup>
55+
<!--- Keep as long as net60 is target, otherwise transient warnings occur-->
5456
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
5557
</ItemGroup>
5658
</Otherwise>

‎Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateBuilder.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
using Org.BouncyCastle.Pkcs;
4747
using Org.BouncyCastle.Security;
4848
using Org.BouncyCastle.X509;
49+
using Org.BouncyCastle.X509.Extension;
4950

5051
namespace Opc.Ua.Security.Certificates
5152
{
@@ -323,7 +324,7 @@ private void CreateExtensions(X509V3CertificateGenerator cg, AsymmetricKeyParame
323324
{
324325
// Subject key identifier
325326
cg.AddExtension(Org.BouncyCastle.Asn1.X509.X509Extensions.SubjectKeyIdentifier.Id, false,
326-
new SubjectKeyIdentifier(SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(subjectPublicKey)));
327+
X509ExtensionUtilities.CreateSubjectKeyIdentifier(SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(subjectPublicKey)));
327328
}
328329

329330
// Basic constraints
@@ -362,7 +363,7 @@ private void CreateExtensions(X509V3CertificateGenerator cg, AsymmetricKeyParame
362363
if (X509Extensions.FindExtension<X509AuthorityKeyIdentifierExtension>(m_extensions) == null)
363364
{
364365
cg.AddExtension(Org.BouncyCastle.Asn1.X509.X509Extensions.AuthorityKeyIdentifier.Id, false,
365-
new AuthorityKeyIdentifier(SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(issuerPublicKey),
366+
X509ExtensionUtilities.CreateAuthorityKeyIdentifier(issuerPublicKey,
366367
new GeneralNames(new GeneralName(m_issuerIssuerAKI)), issuerSerialNumber));
367368
}
368369

‎Stack/Opc.Ua.Core/Opc.Ua.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
use latest versions only on .NET 5/6/7/8, otherwise 3.1.x -->
5757
<When Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
5858
<ItemGroup>
59-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.2" />
60-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32" />
59+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
60+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
6161
</ItemGroup>
6262
</When>
6363
<When Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
@@ -72,14 +72,14 @@
7272
</When>
7373
<When Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472' OR '$(TargetFramework)' == 'net48'">
7474
<ItemGroup>
75-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.2" />
76-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
75+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
76+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
7777
</ItemGroup>
7878
</When>
7979
<Otherwise>
8080
<ItemGroup>
81-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
82-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.4" />
81+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
82+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
8383
</ItemGroup>
8484
</Otherwise>
8585
</Choose>

‎Tests/Opc.Ua.Client.ComplexTypes.Tests/Opc.Ua.Client.ComplexTypes.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1111
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1212
<PackageReference Include="NUnit" Version="4.3.2" />
13-
<PackageReference Include="NUnit.Console" Version="3.20.0" />
13+
<PackageReference Include="NUnit.Console" Version="3.20.1" />
1414
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎Tests/Opc.Ua.Client.Tests/Opc.Ua.Client.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2626
<PackageReference Include="NUnit" Version="4.3.2" />
27-
<PackageReference Include="NUnit.Console" Version="3.20.0" />
27+
<PackageReference Include="NUnit.Console" Version="3.20.1" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2626
<PackageReference Include="NUnit" Version="4.3.2" />
27-
<PackageReference Include="NUnit.Console" Version="3.20.0" />
27+
<PackageReference Include="NUnit.Console" Version="3.20.1" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -33,7 +33,7 @@
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>
36-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
36+
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
3737
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
3838
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
3939
</ItemGroup>

0 commit comments

Comments
 (0)