Merge pull request #228 from WeihanLi/dev

WeihanLi · web-flow · commit 8308b9a30295 · 2024-11-13T22:55:28.000+08:00
1.0.72 preview 1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers/features/dotnet:2": {
           "version": "latest",
-          "additionalVersions": "9.0.100-preview.3.24204.13"
+          "additionalVersions": "lts"
         }
     },
     "customizations": {
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -26,11 +26,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-          6.x
-          7.x
-          8.x
-          9.x
+        dotnet-version: 9.0.x
     - name: dotnet info
       run: dotnet --info
     - name: build
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -15,11 +15,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: |
-            6.0.x
-            7.0.x
-            8.0.x
-            9.0.x
+          dotnet-version: 9.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,11 +14,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
-          9.0.x
+        dotnet-version: 9.0.x
     - name: build
       run: dotnet build
     - name: format
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,7 +5,7 @@
     <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net6.0'">6.0.0</ExtensionPackageVersion>
     <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</ExtensionPackageVersion>
     <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</ExtensionPackageVersion>
-    <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0-rc.2.24473.5</ExtensionPackageVersion>
+    <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0</ExtensionPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(ExtensionPackageVersion)" />
@@ -31,9 +31,9 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="Dapper" Version="2.1.44" />
diff --git a/build/build.cs b/build/build.cs
@@ -1,10 +1,10 @@
 // Copyright (c) 2022-2023 Weihan Li. All rights reserved.
 // Licensed under the Apache license version 2.0 http://www.apache.org/licenses/LICENSE-2.0
 
-var target = CommandLineParser.Val("target", args, "Default");
-var apiKey = CommandLineParser.Val("apiKey", args);
-var stable = CommandLineParser.BooleanVal("stable", args);
-var noPush = CommandLineParser.BooleanVal("noPush", args);
+var target = CommandLineParser.Val(args, "target", "Default");
+var apiKey = CommandLineParser.Val(args, "apiKey");
+var stable = CommandLineParser.BooleanVal(args, "stable");
+var noPush = CommandLineParser.BooleanVal(args, "noPush");
 var branchName = EnvHelper.Val("BUILD_SOURCEBRANCHNAME", "local");
 
 var solutionPath = "./WeihanLi.Common.sln";
@@ -28,7 +28,11 @@
     })
     .WithTaskExecuting(task => Console.WriteLine($@"===== Task {task.Name} {task.Description} executing ======"))
     .WithTaskExecuted(task => Console.WriteLine($@"===== Task {task.Name} {task.Description} executed ======"))
-    .WithTask("hello", b => b.WithExecution(() => Console.WriteLine("Hello dotnet-exec build")))
+    .WithTask("hello", b => b.WithExecution(async () =>
+    {
+        Console.WriteLine("Hello dotnet-exec build");
+        await ExecuteCommandAsync("dotnet-exec info");
+    }))
     .WithTask("build", b =>
     {
         b.WithDescription("dotnet build")
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionPatch>71</VersionPatch>
+    <VersionPatch>72</VersionPatch>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/perf/WeihanLi.Common.Benchmark/Program.cs b/perf/WeihanLi.Common.Benchmark/Program.cs
@@ -1,20 +1,11 @@
 ﻿using BenchmarkDotNet.Running;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace WeihanLi.Common.Benchmark;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var configurationBuilder = new ConfigurationBuilder();
-        configurationBuilder.AddJsonFile("appsettings.json");
-
-        var serviceCollection = new ServiceCollection();
-        serviceCollection.AddSingleton<IConfiguration>(configurationBuilder.Build());
-        DependencyResolver.SetDependencyResolver(serviceCollection);
-
         // BenchmarkRunner.Run<MapperTest>();
         // BenchmarkRunner.Run<CreateInstanceTest>();
         // BenchmarkRunner.Run<DITest>();
diff --git a/perf/WeihanLi.Common.Benchmark/WeihanLi.Common.Benchmark.csproj b/perf/WeihanLi.Common.Benchmark/WeihanLi.Common.Benchmark.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Optimize>true</Optimize>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Benchmark>True</Benchmark>
     <Nullable>disable</Nullable>
   </PropertyGroup>
@@ -15,12 +15,5 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WeihanLi.Common\WeihanLi.Common.csproj" />
-    <ProjectReference Include="..\..\src\WeihanLi.Extensions.Hosting\WeihanLi.Extensions.Hosting.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 </Project>
diff --git a/perf/WeihanLi.Common.Benchmark/appsettings.json b/perf/WeihanLi.Common.Benchmark/appsettings.json
diff --git a/samples/AspNetCoreSample/AspNetCoreSample.csproj b/samples/AspNetCoreSample/AspNetCoreSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/DotNetCoreSample/DotNetCoreSample.csproj b/samples/DotNetCoreSample/DotNetCoreSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/DotNetCoreSample/Program.cs b/samples/DotNetCoreSample/Program.cs
@@ -6,7 +6,7 @@
 
 Console.WriteLine("----------DotNetCoreSample----------");
 
-InvokeHelper.OnInvokeException = ex => ConsoleHelper.ErrorWriteWithColor(ex.ToString(), ConsoleColor.DarkRed);
+InvokeHelper.OnInvokeException = ex => ConsoleHelper.ErrorWriteLineWithColor(ex.ToString(), ConsoleColor.DarkRed);
 
 // ServiceDecoratorTest.MainTest();
 
@@ -345,6 +345,8 @@
 
 // InvokeHelper.TryInvoke(CommandExecutorTest.MainTest);
 
+// InvokeHelper.TryInvoke(() => throw null, 3);
+
 await InvokeHelper.TryInvokeAsync(TemplatingSample.MainTest);
 
 ConsoleHelper.ReadKeyWithPrompt("Press any key to exit");
diff --git a/src/WeihanLi.Common/Helpers/CommandLineParser.cs b/src/WeihanLi.Common/Helpers/CommandLineParser.cs
@@ -14,6 +14,7 @@ public static IEnumerable<string> ParseLine(string line, LineParseOptions? optio
         {
             yield break;
         }
+
         options ??= new();
         var tokenBuilder = new StringBuilder();
 
@@ -91,23 +92,61 @@ public static IEnumerable<string> ParseLine(string line, LineParseOptions? optio
     /// <summary>
     /// Get argument value from arguments
     /// </summary>
-    /// <param name="defaultValue">default argument value when not found</param>
     /// <param name="optionName">argument name to get value</param>
     /// <param name="args">arguments</param>
+    /// <param name="defaultValue">default argument value when not found</param>
     /// <returns>argument value</returns>
     [return: NotNullIfNotNull(nameof(defaultValue))]
     public static string? Val(string optionName, string[]? args = null, string? defaultValue = default)
     {
         return GetValueInternal(args ?? Environment.GetCommandLineArgs(), optionName) ?? defaultValue;
     }
 
+    /// <summary>
+    /// Get argument value from arguments
+    /// </summary>
+    /// <param name="optionName">argument name to get value</param>
+    /// <param name="defaultValue">default argument value when not found</param>
+    /// <param name="args">arguments</param>
+    /// <returns>argument value</returns>
+    [return: NotNullIfNotNull(nameof(defaultValue))]
+    public static string? Val(string optionName, string? defaultValue, string[]? args = null)
+    {
+        return GetValueInternal(args ?? Environment.GetCommandLineArgs(), optionName) ?? defaultValue;
+    }
+
+     /// <summary>
+    /// Get argument value from arguments
+    /// </summary>
+    /// <param name="args">arguments</param>
+    /// <param name="defaultValue">default argument value when not found</param>
+    /// <param name="optionName">argument name to get value</param>
+    /// <returns>argument value</returns>
+    [return: NotNullIfNotNull(nameof(defaultValue))]
+    public static string? Val(string[] args, string optionName, string? defaultValue = null)
+    {
+        return GetValueInternal(args, optionName) ?? defaultValue;
+    }
+
     public static bool BooleanVal(string optionName, string[]? args = null, bool defaultValue = default)
     {
         return GetValueInternal(args ?? Environment.GetCommandLineArgs(), optionName).ToBoolean(defaultValue);
     }
+    
+    public static bool BooleanVal(string optionName, bool defaultValue = default, string[]? args = null)
+    {
+        return GetValueInternal(args ?? Environment.GetCommandLineArgs(), optionName).ToBoolean(defaultValue);
+    }
+
+    public static bool BooleanVal(string[] args, string optionName, bool defaultValue = default)
+    {
+        return GetValueInternal(args, optionName).ToBoolean(defaultValue);
+    }
 
     private static string? GetValueInternal(string[] args, string argumentName)
     {
+        Guard.NotNull(args);
+        Guard.NotNullOrEmpty(argumentName);
         for (var i = 0; i < args.Length; i++)
         {
             if (args[i] == $"--{argumentName}" || args[i] == $"-{argumentName}")
diff --git a/src/WeihanLi.Common/Helpers/ConcurrentSet.cs b/src/WeihanLi.Common/Helpers/ConcurrentSet.cs
@@ -5,7 +5,8 @@ namespace WeihanLi.Common.Helpers;
 
 public sealed class ConcurrentSet<T> : IReadOnlyCollection<T>, ICollection<T> where T : notnull
 {
-    private readonly ConcurrentDictionary<T, object?> _dictionary = new();
+    // https://github.com/dotnet/runtime/issues/39919#issuecomment-954774092
+    private readonly ConcurrentDictionary<T, byte> _dictionary = new();
 
     public bool IsEmpty => _dictionary.IsEmpty;
 
@@ -15,7 +16,7 @@ public sealed class ConcurrentSet<T> : IReadOnlyCollection<T>, ICollection<T> wh
 
     public bool Contains(T item) => _dictionary.ContainsKey(item);
 
-    public bool TryAdd(T t) => _dictionary.TryAdd(t, null);
+    public bool TryAdd(T t) => _dictionary.TryAdd(t, default);
 
     public bool TryRemove(T t) => _dictionary.TryRemove(t, out _);
 
diff --git a/src/WeihanLi.Common/Helpers/InvokeHelper.cs b/src/WeihanLi.Common/Helpers/InvokeHelper.cs
diff --git a/test/WeihanLi.Common.Test/WeihanLi.Common.Test.csproj b/test/WeihanLi.Common.Test/WeihanLi.Common.Test.csproj

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"ghcr.io/devcontainers/features/docker-in-docker:2": {},`
`9`	`9`	`"ghcr.io/devcontainers/features/dotnet:2": {`
`10`	`10`	`"version": "latest",`
`11`		`- "additionalVersions": "9.0.100-preview.3.24204.13"`
	`11`	`+ "additionalVersions": "lts"`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"customizations": {`