Merge pull request #254 from WeihanLi/dev

1.0.80

Author: WeihanLi

Directory.Packages.props

@@ -16,13 +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.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.5.25277.114" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25277.114" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25358.103" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25358.103" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
@@ -36,12 +36,12 @@
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="xunit.v3" Version="2.0.3" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.15.1" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.7" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
     <PackageVersion Include="Dapper" Version="2.1.66" />

build/version.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionPatch>79</VersionPatch>
+    <VersionPatch>80</VersionPatch>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
   </PropertyGroup>
 </Project>

src/WeihanLi.Common/Helpers/ConsoleHelper.cs

@@ -201,4 +201,21 @@ public static CommandResult PrintOutputToConsole(this CommandResult commandResul
 
         return commandResult;
     }
+
+    public static bool HasStandardInput()
+    {
+        return Console.IsInputRedirected && Console.In.Peek() != -1;
+    }
+    
+    public static bool TryGetStandardInput([MaybeNullWhen(false)]out string input)
+    {
+        if (HasStandardInput())
+        {
+            input = Console.In.ReadToEnd();
+            return true;
+        }
+        
+        input = null;
+        return false;
+    }
 }

src/WeihanLi.Common/Helpers/Hosting/BackgroundService.cs

@@ -3,7 +3,7 @@
 
 namespace WeihanLi.Common.Helpers.Hosting;
 
-public abstract class BackgroundService : IHostedService, IDisposable
+public abstract class BackgroundService : IHostedLifecycleService, IDisposable
 {
     private Task? _executeTask;
     private CancellationTokenSource? _stoppingCts;
@@ -51,22 +51,18 @@ public virtual async Task StopAsync(CancellationToken cancellationToken)
             await Task.WhenAny(_executeTask, tcs.Task).ConfigureAwait(false);
         }
     }
-
-    protected abstract Task ExecuteAsync(CancellationToken stoppingToken);
-
-    public virtual void Dispose()
-    {
-        _stoppingCts?.Cancel(false);
-    }
-}
-
-public abstract class BackgroundServiceWithLifecycle : BackgroundService, IHostedLifecycleService
-{
     public virtual Task StartingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
     public virtual Task StartedAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
     public virtual Task StoppingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
     public virtual Task StoppedAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    protected abstract Task ExecuteAsync(CancellationToken stoppingToken);
+
+    public virtual void Dispose()
+    {
+        _stoppingCts?.Cancel(false);
+    }
 }

src/WeihanLi.Common/Http/NoProxyHttpClientHandler.cs

@@ -7,5 +7,6 @@ public NoProxyHttpClientHandler()
         Proxy = null;
         UseProxy = false;
         UseCookies = false;
+        AllowAutoRedirect = false;
     }
 }