Skip to content

Commit 2a0ef7e

Browse files
thohngthohng
committed
Update support .NET 10.0
1 parent 2016132 commit 2a0ef7e

7 files changed

Lines changed: 71 additions & 28 deletions

File tree

‎Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<CurrentFrameworkVersion>8.0.14;9.0.3;10.0.0-preview.1</CurrentFrameworkVersion>
4+
<CurrentFrameworkVersion>8.0.22;9.0.11;10.0.0</CurrentFrameworkVersion>
55
<ImportedCommonProps>True</ImportedCommonProps>
66

77
<NET_ID>$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))</NET_ID>

‎Directory.Build.targets‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<PropertyGroup>
4646
<NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_3_1_LESS_OR_STD)' == true">4.*</NpgsqlVersion>
47-
<NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_10_0)' == true">9.*</NpgsqlVersion>
47+
<NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_10_0)' == true">10.*-*</NpgsqlVersion>
4848
<NpgsqlVersion Condition="'$(NpgsqlVersion)' == ''">$(EFCoreFrameworkVersion)</NpgsqlVersion>
4949
<NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">6.*</NuGetPackageVersion>
5050
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == '' And '$(NET_5_0_LESS)' == true">6.*</SystemTextJsonVersion>
@@ -80,6 +80,7 @@
8080
<PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.*-*" />
8181
<PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.*-*" />
8282
<PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.*-*" />
83+
<PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0" Condition="'$(NET_3_1)' == true" />
8384
<PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.*-*" />
8485
<PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.0.*-*" Condition="'$(NET_7_0_LESS)' == true" />
8586
<PackageReference Update="Testing.Dynamic.Json" Version="1.*-*" />
@@ -88,18 +89,20 @@
8889
<PackageReference Update="AngleSharp" Version="*" />
8990
<PackageReference Update="coverlet.collector" Version="6.*" PrivateAssets="All" />
9091
<PackageReference Update="FluentAssertions" Version="6.*" PrivateAssets="All" />
91-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.*" />
92+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.*" />
9293
<PackageReference Update="Moq" Version="4.*" />
9394
<PackageReference Update="NUnit" Version="3.*" />
9495
<PackageReference Update="NUnit3TestAdapter" Version="4.*" PrivateAssets="All" />
9596
<PackageReference Update="TeamCity.VSTest.TestAdapter" Version="1.*" />
9697
<PackageReference Update="xunit" Version="2.*" />
9798
<PackageReference Update="xunit.extensibility.core" Version="2.*" />
98-
<PackageReference Update="xunit.runner.visualstudio" Version="3.*" PrivateAssets="All" Condition="'$(NET_6_0_UP)' == true" />
99+
<PackageReference Update="xunit.runner.visualstudio" Version="3.*" PrivateAssets="All" Condition="'$(NET_8_0_UP)' == true" />
100+
<PackageReference Update="xunit.runner.visualstudio" Version="2.*" PrivateAssets="All" Condition="'$(NET_7_0_LESS)' == true" />
99101
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.*" PrivateAssets="All" Condition="'$(NET_5_0_LESS)' == true" />
100102

101103
<!--misc-->
102-
<PackageReference Update="AutoMapper" Version="13.*" Condition="'$(NET_6_0_UP)' == true" />
104+
<PackageReference Update="AutoMapper" Version="14.*" Condition="'$(NET_8_0_UP)' == true" />
105+
<PackageReference Update="AutoMapper" Version="13.*" Condition="'$(NET_6_0)' == true Or '$(NET_7_0)' == true" />
103106
<PackageReference Update="AutoMapper" Version="12.*" Condition="'$(NET_5_0_LESS)' == true" />
104107
<PackageReference Update="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.*" />
105108
<PackageReference Update="BouncyCastle.NetCore" Version="1.9.*" />
@@ -135,7 +138,8 @@
135138
<PackageReference Update="SkiaSharp.NativeAssets.NanoServer" Version="2.88.*" />
136139
<PackageReference Update="SkiaSharp.QrCode" Version="0.6.0" />
137140
<PackageReference Update="Spire.Doc" Version="11.*" />
138-
<PackageReference Update="StackExchange.Redis" Version="2.*" />
141+
<PackageReference Update="StackExchange.Redis" Version="2.9.32" Condition="'$(NET_6_0_UP)' == true" />
142+
<PackageReference Update="StackExchange.Redis" Version="2.6.122" Condition="'$(NET_5_0_LESS_OR_STD)' == true" />
139143
<PackageReference Update="Std.UriTemplate" Version="2.*" />
140144
<PackageReference Update="Tavis.UriTemplates" Version="2.*" />
141145
<PackageReference Update="TimeZoneConverter" Version="5.*" />
@@ -168,7 +172,7 @@
168172

169173
<!--microsoft CodeAnalysis-->
170174
<PackageReference Update="Microsoft.CodeAnalysis" Version="4.*" />
171-
<PackageReference Update="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="3.*" />
175+
<PackageReference Update="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="4.*" />
172176
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.*" />
173177
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Features" Version="4.*" />
174178
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.*" />
@@ -288,7 +292,8 @@
288292
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="$(AspNetFrameworkVersion)" />
289293

290294
<!--microsoft entity framework and data-->
291-
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.*" />
295+
<PackageReference Update="Microsoft.Data.SqlClient" Version="6.*" />
296+
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.*" Condition="'$(NET_7_0_LESS_OR_STD)' == true" />
292297
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreFrameworkVersion)" />
293298
<PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EFCoreFrameworkVersion)" />
294299
<PackageReference Update="Microsoft.EntityFrameworkCore.Cosmos" Version="$(EFCoreFrameworkVersion)" />
@@ -340,7 +345,7 @@
340345
<!--microsoft identity-->
341346
<PackageReference Update="Microsoft.Graph" Version="5.*" />
342347
<PackageReference Update="Microsoft.Graph.Core" Version="3.*" />
343-
<PackageReference Update="Microsoft.Identity.Abstractions" Version="7.*" />
348+
<PackageReference Update="Microsoft.Identity.Abstractions" Version="9.*" />
344349
<PackageReference Update="Microsoft.Identity.Client" Version="4.*" />
345350
<PackageReference Update="Microsoft.Identity.Client.Extensions.Msal" Version="4.*" />
346351
<PackageReference Update="Microsoft.Identity.Web" Version="3.*" />
@@ -417,6 +422,21 @@
417422

418423
</ItemGroup>
419424

425+
<ItemGroup Condition="'$(NET_7_0_LESS)' == true">
426+
<PackageReference Update="Microsoft.CodeAnalysis" Version="4.13.*" />
427+
<PackageReference Update="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="3.*" />
428+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.13.*" />
429+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.*" />
430+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.*" />
431+
<PackageReference Update="Microsoft.CodeAnalysis.Features" Version="4.13.*" />
432+
<PackageReference Update="Microsoft.CodeAnalysis.Scripting" Version="4.13.*" />
433+
<PackageReference Update="Microsoft.CodeAnalysis.VisualBasic" Version="4.13.*" />
434+
<PackageReference Update="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.*" />
435+
<PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.*" />
436+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.13.*" />
437+
<PackageReference Update="Microsoft.VisualStudio.Threading" Version="17.13.*" />
438+
</ItemGroup>
439+
420440
<ItemGroup Condition="'$(NET_6_0_UP)' == true">
421441
<PackageReference Update="Serilog" Version="4.*" />
422442
<PackageReference Update="Serilog.AspNetCore" Version="$(SerilogVersion)" />
@@ -429,14 +449,17 @@
429449
<PackageReference Update="Serilog.Settings.Configuration" Version="$(SerilogVersion)" />
430450
<PackageReference Update="Serilog.Sinks.Console" Version="6.*" />
431451
<PackageReference Update="Serilog.Sinks.Debug" Version="3.*" />
432-
<PackageReference Update="Serilog.Sinks.File" Version="6.*" />
452+
<PackageReference Update="Serilog.Sinks.File" Version="7.*" />
433453
<PackageReference Update="Serilog.Sinks.PeriodicBatching" Version="5.*" />
434454
<PackageReference Update="Serilog.Sinks.Seq" Version="9.*" />
435455
</ItemGroup>
436456

437457
<ItemGroup Condition="'$(NET_3_1_LESS_OR_STD)' == true">
438458
<PackageReference Update="Serilog" Version="3.0.*" />
439459
<PackageReference Update="Serilog.AspNetCore" Version="6.*" />
460+
<PackageReference Update="Serilog.Enrichers.CorrelationId" Version="3.*" />
461+
<PackageReference Update="Serilog.Enrichers.Environment" Version="2.*" />
462+
<PackageReference Update="Serilog.Enrichers.Thread" Version="3.*" />
440463
<PackageReference Update="Serilog.Extensions.Hosting" Version="5.*" />
441464
<PackageReference Update="Serilog.Extensions.Logging" Version="3.*" />
442465
<PackageReference Update="Serilog.Formatting.Compact" Version="1.*" />
@@ -451,6 +474,9 @@
451474
<ItemGroup Condition="'$(NET_5_0)' == true">
452475
<PackageReference Update="Serilog" Version="3.0.*" />
453476
<PackageReference Update="Serilog.AspNetCore" Version="6.*" />
477+
<PackageReference Update="Serilog.Enrichers.CorrelationId" Version="3.*" />
478+
<PackageReference Update="Serilog.Enrichers.Environment" Version="2.*" />
479+
<PackageReference Update="Serilog.Enrichers.Thread" Version="3.*" />
454480
<PackageReference Update="Serilog.Extensions.Hosting" Version="5.*" />
455481
<PackageReference Update="Serilog.Extensions.Logging" Version="3.*" />
456482
<PackageReference Update="Serilog.Formatting.Compact" Version="1.*" />
@@ -464,6 +490,9 @@
464490

465491
<ItemGroup Condition="'$(NET_5_0_LESS_OR_STD)' == true">
466492
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.*" PrivateAssets="All" />
493+
<PackageReference Update="Azure.Core" Version="1.45.*" />
494+
<PackageReference Update="Azure.Identity" Version="1.13.*" />
495+
<PackageReference Update="System.ClientModel" Version="1.3.*" />
467496
</ItemGroup>
468497

469498
<ItemGroup Condition="'$(NET_5_0_LESS)' == true">

‎samples/ConsoleApp/ConsoleApp.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
66
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8-
9-
<PropertyGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp' And '$([MSBuild]::GetTargetFrameworkVersion($(TargetFramework)))' &lt;= '7.0'">
10-
<CheckEolTargetFramework>false</CheckEolTargetFramework>
7+
<!--<CheckEolTargetFramework>false</CheckEolTargetFramework>-->
8+
<SuppressTfmSupportBuildErrors>true</SuppressTfmSupportBuildErrors>
119
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1210
</PropertyGroup>
1311

‎src/Directory.Build.targets‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@
6161
<PackageReference Update="NetLah.Extensions.CommandLineUtils" Version="0.1.0-a1.2" />
6262
<PackageReference Update="NetLah.Extensions.Configuration" Version="1.0.0" />
6363
<PackageReference Update="NetLah.Extensions.EventAggregator" Version="1.0.0-rc2" />
64-
<PackageReference Update="NetLah.Extensions.HttpOverrides" Version="1.0.0-rc2" />
64+
<PackageReference Update="NetLah.Extensions.HttpOverrides" Version="1.0.0" />
6565
<PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.0.0" />
66-
<PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.0" />
67-
<PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0" />
68-
<PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.0.0-rc3" />
66+
<PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.1" Condition="'$(NET_10_0_UP)' == true" />
67+
<PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.1" Condition="'$(NET_10_0_UP)' == true" />
68+
<PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.0" Condition="'$(NET_9_0_LESS)' == true" />
69+
<PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0" Condition="'$(NET_9_0_LESS)' == true" />
70+
<PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.2.0" />
6971
<PackageReference Update="Testing.Dynamic.Json" Version="1.0.0" />
7072

7173
<!--serilog-->
@@ -119,7 +121,7 @@
119121
<PackageReference Update="Microsoft.OpenApi" Version="1.0.0" />
120122

121123
</ItemGroup>
122-
124+
123125
<ItemGroup Condition="'$(NET_8_0_LESS_OR_STD)' == true">
124126
<PackageReference Update="Serilog" Version="3.1.1" />
125127
<PackageReference Update="Serilog.Formatting.Compact" Version="2.0.0" />

‎src/NetLah.Extensions.Configuration/CertificateLoader.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ public static class CertificateLoader
7575

7676
#if NET9_0_OR_GREATER
7777
var result = X509CertificateLoader.LoadPkcs12(cert.Export(X509ContentType.Pkcs12), null);
78+
cert.Dispose();
7879
#else
7980
var result = new X509Certificate2(cert.Export(X509ContentType.Pkcs12));
81+
cert.Dispose();
8082
#endif
8183
return result;
8284
}

‎test/NetLah.Extensions.Configuration.Test/CertificateLoaderMutualTlsTest.cs‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Net.NetworkInformation;
33
using System.Net.Security;
44
using System.Net.Sockets;
5+
using System.Security.Cryptography;
56
using System.Security.Cryptography.X509Certificates;
67
using System.Text;
78
using Xunit;
@@ -13,14 +14,14 @@ public class CertificateLoaderMutualTlsTest
1314
[Theory]
1415
[InlineData("development.dummy_ecdh_p384-2021June.pfx", false, true)]
1516
[InlineData("development.dummy_ecdh_p384-2021June_nopass.pfx", false, false)]
16-
#if NET5_0_OR_GREATER
17+
#if NET5_0_OR_GREATER && !NET10_0
1718
[InlineData("development.dummy_ecdh_p521-2021June.pfx", false, true)]
1819
[InlineData("development.dummy_ecdh_p521-2021June_nopass.pfx", false, false)]
1920
#endif
2021
[InlineData("development.dummy_ecdsa_p384-2024Nov_3ds-sha1.pfx", false, true)]
2122
[InlineData("development.dummy_ecdsa_p384-2024Nov.pfx", false, true)]
2223
[InlineData("development.dummy_ecdsa_p384-2024Nov_nopass.pfx", false, false)]
23-
#if NET5_0_OR_GREATER
24+
#if NET5_0_OR_GREATER && !NET10_0
2425
[InlineData("development.dummy_ecdsa_p521-2024Nov.pfx", false, true)]
2526
[InlineData("development.dummy_ecdsa_p521-2024Nov_nopass.pfx", false, false)]
2627
#endif
@@ -31,12 +32,16 @@ public class CertificateLoaderMutualTlsTest
3132
#if NET6_0_OR_GREATER
3233
[InlineData("development.dummy_ecdh_p384-2021June.pem", true, true)]
3334
[InlineData("development.dummy_ecdh_p384-2021June_noenc.pem", true, false)]
35+
#if !NET10_0
3436
[InlineData("development.dummy_ecdh_p521-2021June.pem", true, true)]
3537
[InlineData("development.dummy_ecdh_p521-2021June_noenc.pem", true, false)]
38+
#endif
3639
[InlineData("development.dummy_ecdsa_p384-2024Nov.pem", true, true)]
3740
[InlineData("development.dummy_ecdsa_p384-2024Nov_noenc.pem", true, false)]
41+
#if !NET10_0
3842
[InlineData("development.dummy_ecdsa_p521-2024Nov.pem", true, true)]
3943
[InlineData("development.dummy_ecdsa_p521-2024Nov_noenc.pem", true, false)]
44+
#endif
4045
[InlineData("development.dummy-rsa-2071June.pem", true, true)]
4146
[InlineData("development.dummy-rsa-2071June_noenc.pem", true, false)]
4247
[InlineData("development.dummy-rsa4096-2071June.pem", true, true)]
@@ -64,11 +69,11 @@ private static void AuthenticateCertificate(X509Certificate2 certificate)
6469
{
6570
if (certificate.GetRSAPrivateKey() is { })
6671
{
67-
ClientServerAuthenticate(certificate);
72+
ClientServerAuthenticate(certificate, false);
6873
}
6974
else if (certificate.GetECDsaPrivateKey() is { } ecdsa)
7075
{
71-
ClientServerAuthenticate(certificate);
76+
ClientServerAuthenticate(certificate, true);
7277
Assert.True(ecdsa != null);
7378
}
7479
else
@@ -84,13 +89,22 @@ private class PortBox
8489
public int Port { get => _port; set => _port = value; }
8590
}
8691

87-
private static void ClientServerAuthenticate(X509Certificate2 certificate)
92+
private static void ClientServerAuthenticate(X509Certificate2 certificate, bool isEcdsa)
8893
{
8994
const int port1 = 19000;
9095
const int port2 = 19999;
9196
const string plainText = "Hello, world! こんにちは世界 ഹലോ വേൾഡ് Kαληµε´ρα κο´σµε";
9297
var plainMessage = Encoding.UTF8.GetBytes(plainText);
9398

99+
if (isEcdsa)
100+
{
101+
Assert.IsType<ECDsa>(certificate.GetECDsaPrivateKey(), false);
102+
}
103+
else
104+
{
105+
Assert.IsType<RSA>(certificate.GetRSAPrivateKey(), false);
106+
}
107+
94108
var clientCompleted = new TaskCompletionSource<int>();
95109
var serverInitialized = new TaskCompletionSource<int>();
96110
Exception? clientFault = null;

‎test/NetLah.Extensions.Configuration.Test/NetLah.Extensions.Configuration.Test.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>../../NetLah.snk</AssemblyOriginatorKeyFile>
88
<UserSecretsId>netlah-config-test-5f1c15e5acb0</UserSecretsId>
9-
</PropertyGroup>
10-
11-
<PropertyGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp' And '$([MSBuild]::GetTargetFrameworkVersion($(TargetFramework)))' &lt;= '7.0'">
12-
<CheckEolTargetFramework>false</CheckEolTargetFramework>
9+
<!--<CheckEolTargetFramework>false</CheckEolTargetFramework>-->
10+
<SuppressTfmSupportBuildErrors>true</SuppressTfmSupportBuildErrors>
1311
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1412
</PropertyGroup>
1513

0 commit comments

Comments
 (0)