Merge pull request #244 from WeihanLi/dev

WeihanLi · web-flow · commit 56fd33b5b6c2 · 2025-03-05T23:32:24.000+08:00
1.0.75
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -26,7 +26,10 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
     - name: dotnet info
       run: dotnet --info
     - name: build
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: install DocFX
         run: "dotnet tool install -g docfx"
       - name: Build docs
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: build
       run: dotnet build
     - name: format
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,10 +13,9 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
           9.0.x
+          10.0.x
     - name: Build
       shell: pwsh
       run: .\build.ps1 --stable=true
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <Import Project="./build/version.props" />
   <PropertyGroup>
+    <LatestTargetFramework>net10.0</LatestTargetFramework>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -16,9 +16,13 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.1.25080.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.1.25080.5" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
@@ -28,23 +32,22 @@
     <PackageVersion Include="Serilog" Version="4.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="FluentAssertions" Version="6.6.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit.v3" Version="1.0.1" />
     <PackageVersion Include="Xunit.DependencyInjection" Version="9.3.0" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.2" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-    <PackageVersion Include="Dapper" Version="2.1.44" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+    <PackageVersion Include="Dapper" Version="2.1.66" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="PolySharp" Version="1.15.0" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,16 +19,6 @@ pool:
   vmImage: 'windows-latest'
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Use .NET 6 sdk'
-  inputs:
-    packageType: sdk
-    version: 6.0.x
-- task: UseDotNet@2
-  displayName: 'Use .NET 7 sdk'
-  inputs:
-    packageType: sdk
-    version: 7.0.x
 - task: UseDotNet@2
   displayName: 'Use .NET 8 sdk'
   inputs:
@@ -39,6 +29,11 @@ steps:
   inputs:
     packageType: sdk
     version: 9.0.x
+- task: UseDotNet@2
+  displayName: 'Use .NET 10 sdk'
+  inputs:
+    packageType: sdk
+    version: 10.0.x
     includePreviewVersions: true # Required for preview versions
 
 - script: dotnet --info
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionPatch>74</VersionPatch>
+    <VersionPatch>75</VersionPatch>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/perf/WeihanLi.Common.Benchmark/WeihanLi.Common.Benchmark.csproj b/perf/WeihanLi.Common.Benchmark/WeihanLi.Common.Benchmark.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>$(LatestTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
     <Optimize>true</Optimize>
-    <TargetFramework>net9.0</TargetFramework>
     <Benchmark>True</Benchmark>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/samples/AspNetCoreSample/AspNetCoreSample.csproj b/samples/AspNetCoreSample/AspNetCoreSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(LatestTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/DotNetCoreSample/DotNetCoreSample.csproj b/samples/DotNetCoreSample/DotNetCoreSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(LatestTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/DotNetCoreSample/EventTest.cs b/samples/DotNetCoreSample/EventTest.cs
@@ -48,6 +48,36 @@ public static async Task MainTest()
             });
         }
     }
+
+    public static async Task AckQueueTest()
+    {
+        var ackQueue = new AckQueue(new AckQueueOptions()
+        {
+            AckTimeout = TimeSpan.FromSeconds(1)
+        });
+        await ackQueue.EnqueueAsync(new CounterEvent { Counter = 1 });
+        await ackQueue.EnqueueAsync(new CounterEvent { Counter = 2 });
+        
+        var event1 = await ackQueue.DequeueAsync<CounterEvent>();
+        ArgumentNullException.ThrowIfNull(event1);
+        Console.WriteLine(@$"event1: {event1.ToJson()}");
+        
+        var event2 = await ackQueue.DequeueAsync<CounterEvent>();
+        ArgumentNullException.ThrowIfNull(event2);
+        Console.WriteLine(@$"event2: {event2.ToJson()}");
+        
+        await ackQueue.AckMessageAsync(event2.Properties.EventId);
+        var event3 = await ackQueue.DequeueAsync<CounterEvent>();
+        Console.WriteLine(@$"event3: {event3.ToJson()}");
+
+        await Task.Delay(2000);
+        ackQueue.RequeueUnAckedMessages();
+        
+        var event4 = await ackQueue.DequeueAsync<CounterEvent>();
+        Console.WriteLine(@$"event4: {event4.ToJson()}");
+        ArgumentNullException.ThrowIfNull(event4);
+        await ackQueue.AckMessageAsync(event4.Properties.EventId);
+    }
 }
 
 public class CounterEvent
diff --git a/samples/DotNetCoreSample/Program.cs b/samples/DotNetCoreSample/Program.cs
@@ -347,8 +347,8 @@
 
 // InvokeHelper.TryInvoke(() => throw null, 3);
 
-InvokeHelper.TryInvoke(LoggerTest.MicrosoftLoggingTest);
-// await InvokeHelper.TryInvokeAsync(InMemoryStreamTest.MainTest);
+// InvokeHelper.TryInvoke(LoggerTest.MicrosoftLoggingTest);
+await InvokeHelper.TryInvokeAsync(EventTest.AckQueueTest);
 
 ConsoleHelper.ReadKeyWithPrompt("Press any key to exit");
 
diff --git a/src/WeihanLi.Common.Logging.Serilog/WeihanLi.Common.Logging.Serilog.csproj b/src/WeihanLi.Common.Logging.Serilog/WeihanLi.Common.Logging.Serilog.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;</TargetFrameworks>
     <PackageProjectUrl>https://github.com/WeihanLi/WeihanLi.Common/tree/dev/src/WeihanLi.Common.Logging.Serilog</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>$(PackageTags);logging;serilog</PackageTags>
diff --git a/src/WeihanLi.Common/Event/AckQueue.cs b/src/WeihanLi.Common/Event/AckQueue.cs
@@ -6,7 +6,7 @@ namespace WeihanLi.Common.Event;
 
 public sealed class AckQueueOptions
 {
-    public TimeSpan AckTimeout { get; set; } = TimeSpan.FromMinutes(1);
+    public TimeSpan AckTimeout { get; set; } = TimeSpan.FromMinutes(10);
 
     public bool AutoRequeue { get; set; }
 
diff --git a/src/WeihanLi.Common/Extensions/ReflectionExtension.cs b/src/WeihanLi.Common/Extensions/ReflectionExtension.cs
@@ -309,4 +309,37 @@ public static bool IsDefined(this Assembly element, Type attributeType, bool inh
         Guard.NotNull(element);
         return Attribute.IsDefined(element, attributeType, inherit);
     }
+    
+    /// <summary>
+    /// Get Assembly Display Version
+    /// </summary>
+    /// <param name="assembly">assembly</param>
+    /// <returns>Version info</returns>
+    public static string? GetDisplayVersion(this Assembly assembly)
+    {
+        // The package version is stamped into the assembly's AssemblyInformationalVersionAttribute at build time, followed by a '+' and
+        // the commit hash, e.g.:
+        // [assembly: AssemblyInformationalVersion("8.0.0-preview.2.23604.7+e7762a46d31842884a0bc72c92e07ba700c99bf5")]
+
+        var version = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+
+        if (version is not null)
+        {
+            var plusIndex = version.IndexOf('+');
+
+            if (plusIndex > 0)
+            {
+                return version[..plusIndex];
+            }
+
+            return version;
+        }
+
+        // Fallback to the file version, which is based on the CI build number, and then fallback to the assembly version, which is
+        // product stable version, e.g. 8.0.0.0
+        version = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version
+                  ?? assembly.GetCustomAttribute<AssemblyVersionAttribute>()?.Version;
+
+        return version;
+    }
 }
diff --git a/src/WeihanLi.Common/Services/CancellationTokenProvider.cs b/src/WeihanLi.Common/Services/CancellationTokenProvider.cs
@@ -7,5 +7,5 @@ public interface ICancellationTokenProvider
 
 public sealed class NullCancellationTokenProvider : ICancellationTokenProvider
 {
-    public CancellationToken GetCancellationToken() => default;
+    public CancellationToken GetCancellationToken() => CancellationToken.None;
 }
diff --git a/src/WeihanLi.Common/WeihanLi.Common.csproj b/src/WeihanLi.Common/WeihanLi.Common.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>            
     <PackageId>WeihanLi.Common</PackageId>
     <Title>WeihanLi.Common</Title>
-    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <Description>common libarary,extensions helpers and useful utilities</Description>
     <PackageTags>$(PackageTags);common;utility;lib;libarary;extensions;helpers</PackageTags>
     <PackageSummary>common libarary,extensions helpers and useful utilities</PackageSummary>
@@ -12,7 +12,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=vs-2022#msbuild-targetframework-and-targetplatform-functions -->
-    <IsAotCompatible>$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))</IsAotCompatible>
+    <IsAotCompatible>$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))</IsAotCompatible>
     <!-- DynamicallyAccessedMembers not included by default https://github.com/Sergio0694/PolySharp/issues/84#issuecomment-1751772472 -->
     <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
   </PropertyGroup>  
diff --git a/test/WeihanLi.Common.Test/AspectTest/ServiceCollectionBuildTest.cs b/test/WeihanLi.Common.Test/AspectTest/ServiceCollectionBuildTest.cs
@@ -4,7 +4,6 @@
 using WeihanLi.Common.Services;
 using WeihanLi.Common.Test.EventsTest;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace WeihanLi.Common.Test.AspectTest;
 
diff --git a/test/WeihanLi.Common.Test/AspectTest/ServiceContainerBuilderBuildTest.cs b/test/WeihanLi.Common.Test/AspectTest/ServiceContainerBuilderBuildTest.cs
@@ -5,7 +5,6 @@
 using WeihanLi.Common.Services;
 using WeihanLi.Common.Test.EventsTest;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace WeihanLi.Common.Test.AspectTest;
 
diff --git a/test/WeihanLi.Common.Test/EventsTest/AckQueueTest.cs b/test/WeihanLi.Common.Test/EventsTest/AckQueueTest.cs
@@ -65,7 +65,7 @@ public async Task RequeueUnAckedMessagesAsync_ShouldRequeueUnAckedMessagesAfterT
             Assert.NotNull(dequeuedEvent);
 
             // Simulate timeout
-            await Task.Delay(TimeSpan.FromSeconds(5));
+            await Task.Delay(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
             ackQueue.RequeueUnAckedMessages();
 
@@ -90,7 +90,7 @@ public async Task AutoRequeueUnAckedMessagesAsync_ShouldRequeueUnAckedMessagesAf
             Assert.NotNull(dequeuedEvent);
 
             // Simulate timeout
-            await Task.Delay(TimeSpan.FromSeconds(5));
+            await Task.Delay(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
             var requeuedEvent = await ackQueue.DequeueAsync<TestEvent>();
             Assert.NotNull(requeuedEvent);
@@ -99,7 +99,7 @@ public async Task AutoRequeueUnAckedMessagesAsync_ShouldRequeueUnAckedMessagesAf
 
         private class TestEvent
         {
-            public string Message { get; set; }
+            public string Message { get; set; } = string.Empty;
         }
     }
 }
diff --git a/test/WeihanLi.Common.Test/HelpersTest/CommandExecutorTest.cs b/test/WeihanLi.Common.Test/HelpersTest/CommandExecutorTest.cs
@@ -30,7 +30,7 @@ public async Task HostNameTestAsync()
             return;
         }
 
-        var result = await CommandExecutor.ExecuteAndCaptureAsync("hostname");
+        var result = await CommandExecutor.ExecuteAndCaptureAsync("hostname", cancellationToken: TestContext.Current.CancellationToken);
 
         var hostName = Dns.GetHostName();
         Assert.Equal(hostName, result.StandardOut.TrimEnd());
diff --git a/test/WeihanLi.Common.Test/HttpTest/MockHttpHandlerTest.cs b/test/WeihanLi.Common.Test/HttpTest/MockHttpHandlerTest.cs
@@ -20,7 +20,7 @@ public async Task HttpStatusTest(HttpStatusCode httpStatusCode)
     {
         using var httpHandler = new MockHttpHandler(_ => new HttpResponseMessage(httpStatusCode));
         using var httpClient = new HttpClient(httpHandler);
-        using var response = await httpClient.GetAsync("http://localhost:32123/api/values");
+        using var response = await httpClient.GetAsync("http://localhost:32123/api/values", TestContext.Current.CancellationToken);
         Assert.Equal(httpStatusCode, response.StatusCode);
     }
 
@@ -29,11 +29,11 @@ public async Task SetResponseFactoryTest()
     {
         using var httpHandler = new MockHttpHandler();
         using var httpClient = new HttpClient(httpHandler);
-        using var response = await httpClient.GetAsync("http://localhost:32123/api/values");
+        using var response = await httpClient.GetAsync("http://localhost:32123/api/values", TestContext.Current.CancellationToken);
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
         httpHandler.SetResponseFactory(_ => new HttpResponseMessage(HttpStatusCode.BadRequest));
-        using var response1 = await httpClient.GetAsync("http://localhost:32123/api/values");
+        using var response1 = await httpClient.GetAsync("http://localhost:32123/api/values", TestContext.Current.CancellationToken);
         Assert.Equal(HttpStatusCode.BadRequest, response1.StatusCode);
     }
 
@@ -45,11 +45,11 @@ public async Task DynamicResponseTest()
             Content = new StringContent(req.Method.Method)
         });
         using var httpClient = new HttpClient(httpHandler);
-        var response = await httpClient.GetStringAsync("http://localhost:32123/api/values");
+        var response = await httpClient.GetStringAsync("http://localhost:32123/api/values", TestContext.Current.CancellationToken);
         Assert.Equal(HttpMethod.Get.Method, response);
 
-        using var httpResponse = await httpClient.PostAsync("http://localhost:32123/api/values", new StringContent(""));
-        response = await httpResponse.Content.ReadAsStringAsync();
+        using var httpResponse = await httpClient.PostAsync("http://localhost:32123/api/values", new StringContent(""), TestContext.Current.CancellationToken);
+        response = await httpResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
         Assert.Equal(HttpMethod.Post.Method, response);
     }
 }
diff --git a/test/WeihanLi.Common.Test/ServicesTest/CancellationTokenProviderTest.cs b/test/WeihanLi.Common.Test/ServicesTest/CancellationTokenProviderTest.cs
@@ -10,6 +10,6 @@ public void NullCancellationTokenProviderTest()
     {
         var provider = new NullCancellationTokenProvider();
         var cancellationToken = provider.GetCancellationToken();
-        Assert.Equal(default, cancellationToken);
+        Assert.Equal(CancellationToken.None, cancellationToken);
     }
 }
diff --git a/test/WeihanLi.Common.Test/WeihanLi.Common.Test.csproj b/test/WeihanLi.Common.Test/WeihanLi.Common.Test.csproj
