Merge pull request #181 from WeihanLi/dev

1.0.61
WeihanLi · Jan 4, 2024 · e1bd2eb · e1bd2eb
2 parents cd70206 + 1311d0f
commit e1bd2eb
Show file tree

Hide file tree

Showing 111 changed files with 1,203 additions and 1,504 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "husky": {
-      "version": "0.6.2",
+      "version": "0.6.4",
       "commands": [
         "husky"
       ]

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -12,33 +12,25 @@ on:
       - "dev"
 
 jobs:
-  mac-build:
-    runs-on: macos-latest
+  build:
+    name: Running tests on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
-    - name: build
-      run: bash build.sh
-
-  linux-build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
+          6.x
+          7.x
+          8.x
+    - name: dotnet info
+      run: dotnet --info
     - name: build
-      run: bash build.sh
+      run: bash build.sh --target=test
 
   windows-build:
     runs-on: windows-latest

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,4 @@
     <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true' or '$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Condition="'$(Configuration)'=='Debug'" Include="WeihanLi.Common.Test" />
-  </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,16 +15,14 @@
     <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="AspectCore.Core" Version="2.4.0" />
-    <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="Serilog" Version="3.1.1" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="FluentAssertions" Version="6.6.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="xunit" Version="2.6.1" />
+    <PackageVersion Include="xunit" Version="2.6.4" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
     <PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.1.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
@@ -40,7 +38,6 @@
     <PackageVersion Include="Dapper" Version="2.1.21" />
   </ItemGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="PolySharp" Version="1.13.2" />
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <GlobalPackageReference Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/README.md b/README.md
@@ -12,31 +12,14 @@
 
 ## Intro
 
-.NET 常用帮助类，扩展方法等，基础类库
-
-## Packages
-
-与这个 Repository 相关的 nuget 包：
-
-- [WeihanLi.Common](https://www.nuget.org/packages/WeihanLi.Common) 基础组件
-- [WeihanLi.Common.Aspect.Castle](https://www.nuget.org/packages/WeihanLi.Common.Aspect.Castle/)  基于 Castle 的 AOP 扩展
-- [WeihanLi.Common.Aspect.AspectCore](https://www.nuget.org/packages/WeihanLi.Common.Aspect.Castle/)  基于 AspectCore 的 AOP 扩展（`CreateProxyWithTarget` 不支持 class)
-- [WeihanLi.Data](https://www.nuget.org/packages/WeihanLi.Data) 数据库扩展
-- [WeihanLi.Common.Logging.Serilog](https://www.nuget.org/packages/WeihanLi.Common.Logging.Serilog) 日志 serilog 扩展
-
-## Extensions
-
-- [CoreExtension](./src/WeihanLi.Common/Extensions/CoreExtension.cs) FCL基础类型的一些常用扩展方法
-- [ConfigurationExtension](./src/WeihanLi.Common/Extensions/ConfigurationExtension.cs) 配置相关扩展方法
-- [DataExtension](./src/WeihanLi.Common/Extensions/DataExtension.cs) 数据库操作相关扩展方法
-- and more ...
+.NET Helpers, extensions, utility and more ...
 
 ## Features
 
 - Dependence Injection(类比微软依赖注入框架自定义实现的依赖注入框架)
 - Fluent Aspects -- AOP implemented(基于动态代理实现的 AOP 框架)
 - Event Related(EventBus/EventQueue/EventStore)
-- Logging Framework(结合serilog/微软日志框架实现的日志框架)
+- Logging Framework(结合Serilog/微软日志框架实现的日志框架)
 - Dapper-like Ado.Net extensions(类似 Dapper 的 Ado.Net 扩展)
 - TOTP implement(TOTP算法实现)
 - and more ...

diff --git a/WeihanLi.Common.sln b/WeihanLi.Common.sln
@@ -21,14 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{E7873908-B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.Common.Benchmark", "perf\WeihanLi.Common.Benchmark\WeihanLi.Common.Benchmark.csproj", "{FE575EBF-A41F-41AE-A865-E7F2E2FD90B4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.Data", "src\WeihanLi.Data\WeihanLi.Data.csproj", "{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.Common.Logging.Serilog", "src\WeihanLi.Common.Logging.Serilog\WeihanLi.Common.Logging.Serilog.csproj", "{BBD103A7-78BC-4B31-9DA7-2E79FA266E22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.Common.Aspect.Castle", "src\WeihanLi.Common.Aspect.Castle\WeihanLi.Common.Aspect.Castle.csproj", "{67AF4380-35BA-4FBE-A53A-DBC822FF00B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.Common.Aspect.AspectCore", "src\WeihanLi.Common.Aspect.AspectCore\WeihanLi.Common.Aspect.AspectCore.csproj", "{A58FF0A2-BECB-4B35-975E-6F56BBFE2501}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeihanLi.Extensions.Hosting", "src\WeihanLi.Extensions.Hosting\WeihanLi.Extensions.Hosting.csproj", "{3E93CA2E-132B-42D4-9EFD-B75A478EAA06}"
 EndProject
 Global
@@ -57,22 +51,10 @@ Global
 		{FE575EBF-A41F-41AE-A865-E7F2E2FD90B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE575EBF-A41F-41AE-A865-E7F2E2FD90B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE575EBF-A41F-41AE-A865-E7F2E2FD90B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BBD103A7-78BC-4B31-9DA7-2E79FA266E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBD103A7-78BC-4B31-9DA7-2E79FA266E22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBD103A7-78BC-4B31-9DA7-2E79FA266E22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBD103A7-78BC-4B31-9DA7-2E79FA266E22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67AF4380-35BA-4FBE-A53A-DBC822FF00B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67AF4380-35BA-4FBE-A53A-DBC822FF00B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67AF4380-35BA-4FBE-A53A-DBC822FF00B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67AF4380-35BA-4FBE-A53A-DBC822FF00B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A58FF0A2-BECB-4B35-975E-6F56BBFE2501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A58FF0A2-BECB-4B35-975E-6F56BBFE2501}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A58FF0A2-BECB-4B35-975E-6F56BBFE2501}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A58FF0A2-BECB-4B35-975E-6F56BBFE2501}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E93CA2E-132B-42D4-9EFD-B75A478EAA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E93CA2E-132B-42D4-9EFD-B75A478EAA06}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E93CA2E-132B-42D4-9EFD-B75A478EAA06}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -87,10 +69,7 @@ Global
 		{96ABA64E-FE2A-4103-8C53-C277AE506068} = {80015E01-44D6-4F23-BE7C-820A37074418}
 		{5A45C3FA-1E12-42A0-910E-18A0CF3D288A} = {80015E01-44D6-4F23-BE7C-820A37074418}
 		{FE575EBF-A41F-41AE-A865-E7F2E2FD90B4} = {E7873908-B10D-4AA8-B2E0-198123026E0B}
-		{911AB29A-5607-4CAF-B9FF-A20B0BDDA5B8} = {63395248-E549-4CEA-858B-DEAB098DF7E3}
 		{BBD103A7-78BC-4B31-9DA7-2E79FA266E22} = {63395248-E549-4CEA-858B-DEAB098DF7E3}
-		{67AF4380-35BA-4FBE-A53A-DBC822FF00B2} = {63395248-E549-4CEA-858B-DEAB098DF7E3}
-		{A58FF0A2-BECB-4B35-975E-6F56BBFE2501} = {63395248-E549-4CEA-858B-DEAB098DF7E3}
 		{3E93CA2E-132B-42D4-9EFD-B75A478EAA06} = {63395248-E549-4CEA-858B-DEAB098DF7E3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -36,4 +36,3 @@ steps:
   displayName: 'Powershell Script'
   env:
     Nuget__ApiKey: $(nugetApiKey)
-    Nuget__SourceUrl: $(nugetSourceUrl)
diff --git a/build.cake b/build.cake
diff --git a/build.ps1 b/build.ps1
@@ -1,8 +1,5 @@
-[string]$SCRIPT       = '.\build.cake'
-
-# Install cake.tool
-dotnet tool install --global cake.tool
-
-Write-Host "dotnet cake $SCRIPT $ARGS" -ForegroundColor GREEN
+dotnet tool update -g dotnet-execute --prerelease
 
-dotnet cake $SCRIPT $CAKE_ARGS $ARGS
+Write-Host 'dotnet-exec ./build/build.cs "--args=$ARGS"' -ForegroundColor GREEN
+
+dotnet-exec ./build/build.cs --args $ARGS
diff --git a/build.sh b/build.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-SCRIPT='./build.cake'
 
-# Install cake.tool
-dotnet tool install --global cake.tool
+dotnet tool update -g dotnet-execute --prerelease
 export PATH="$PATH:$HOME/.dotnet/tools"
 
-echo "dotnet cake $SCRIPT $@"
-
-dotnet cake $SCRIPT "$@"
+echo "dotnet-exec ./build/build.cs --args $@"
+dotnet-exec ./build/build.cs --args "$@"