更新代码示例，更新 action 脚本

teacher-zhou · Jan 19, 2024 · 56c5aa4 · 56c5aa4
1 parent 1c1a6ef
commit 56c5aa4
Show file tree

Hide file tree

Showing 136 changed files with 170 additions and 3,519 deletions.
diff --git a/.github/workflows/manual-nuget-pack.yml b/.github/workflows/manual-nuget-pack.yml
@@ -25,18 +25,20 @@ jobs:
             8.0.x
       - name: 编译
         run: |
-          dotnet build ./src/Bizer/Bizer.csproj -c release
-          dotnet build ./src/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release
-          dotnet build ./src/Bizer.Client/Bizer.Client.csproj -c release
-          dotnet build ./src/Bizer.Services/Bizer.Services.csproj -c release
-          dotnet build ./src/Bizer.Localization/Bizer.Localization.csproj -c release
+          dotnet build ./src/Core/Bizer/Bizer.csproj -c release
+          dotnet build ./src/Core/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release
+          dotnet build ./src/Core/Bizer.Client/Bizer.Client.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.ApplicationService.Abstractions/Bizer.Extensions.ApplicationService.Abstractions.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.ApplicationService.EntityFrameworkCore/Bizer.Extensions.ApplicationService.EntityFrameworkCore.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.AutoInjection/Bizer.Extensions.AutoInjection.csproj -c release
       - name: 发布 nuget 包
         run: |
-          dotnet pack ./src/Bizer/Bizer.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Client/Bizer.Client.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Services/Bizer.Services.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Localization/Bizer.Localization.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Core/Bizer/Bizer.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Core/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Core/Bizer.Client/Bizer.Client.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Extensions/Bizer.Extensions.ApplicationService.Abstractions/Bizer.Extensions.ApplicationService.Abstractions.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Extensions/Bizer.Extensions.ApplicationService.EntityFrameworkCore/Bizer.Extensions.ApplicationService.EntityFrameworkCore.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          dotnet pack ./src/Extensions/Bizer.Extensions.AutoInjection/Bizer.Extensions.AutoInjection.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
 
           dotnet nuget push './pack/*.nupkg' -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate
 

diff --git a/.github/workflows/tag-auto-nuget-pack.yml b/.github/workflows/tag-auto-nuget-pack.yml
@@ -23,18 +23,23 @@ jobs:
             8.0.x
       - name: 编译
         run: |
-          dotnet build ./src/Bizer/Bizer.csproj -c release
-          dotnet build ./src/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release
-          dotnet build ./src/Bizer.Client/Bizer.Client.csproj -c release
-          dotnet build ./src/Bizer.Services/Bizer.Services.csproj -c release
-          dotnet build ./src/Bizer.Localization/Bizer.Localization.csproj -c release
+          dotnet build ./src/Core/Bizer/Bizer.csproj -c release
+          dotnet build ./src/Core/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release
+          dotnet build ./src/Core/Bizer.Client/Bizer.Client.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.ApplicationService.Abstractions/Bizer.Extensions.ApplicationService.Abstractions.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.ApplicationService.EntityFrameworkCore/Bizer.Extensions.ApplicationService.EntityFrameworkCore.csproj -c release
+          dotnet build ./src/Extensions/Bizer.Extensions.AutoInjection/Bizer.Extensions.AutoInjection.csproj -c release
       - name: 发布 nuget 包
         run: |
-          dotnet pack ./src/Bizer/Bizer.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Client/Bizer.Client.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Services/Bizer.Services.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
-          dotnet pack ./src/Bizer.Localization/Bizer.Localization.csproj -c release -o ./pack -p:PackageVersion=${{ github.event.inputs.version }}
+          VERSION=`git describe --tags`
+          echo "Publishing Version: ${VERSION}"
+
+          dotnet pack ./src/Core/Bizer/Bizer.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
+          dotnet pack ./src/Core/Bizer.AspNetCore/Bizer.AspNetCore.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
+          dotnet pack ./src/Core/Bizer.Client/Bizer.Client.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
+          dotnet pack ./src/Extensions/Bizer.Extensions.ApplicationService.Abstractions/Bizer.Extensions.ApplicationService.Abstractions.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
+          dotnet pack ./src/Extensions/Bizer.Extensions.ApplicationService.EntityFrameworkCore/Bizer.Extensions.ApplicationService.EntityFrameworkCore.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
+          dotnet pack ./src/Extensions/Bizer.Extensions.AutoInjection/Bizer.Extensions.AutoInjection.csproj -c release -o ./pack -p:PackageVersion=${VERSION}
 
           dotnet nuget push './pack/*.nupkg' -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate
 

diff --git a/Bizer.sln b/Bizer.sln
@@ -17,10 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{465170C5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documents", "Documents", "{19BDE7E5-138D-4975-AC1F-94DC9FD92014}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Services", "sample\Sample.Services\Sample.Services.csproj", "{D9EC8968-B009-4E34-902F-9F253039E46E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.WebApi", "sample\Sample.WebApi\Sample.WebApi.csproj", "{D280B47D-A729-45B0-9364-73280314BE68}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Client", "sample\Sample.Client\Sample.Client.csproj", "{F04B58B7-0F94-421F-B85B-B7F0038572D6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.AspNetCore.Test", "test\Bizer.AspNetCore.Test\Bizer.AspNetCore.Test.csproj", "{D4BEC1DE-5B59-4E24-A7CB-FC69F0CBAF0A}"
@@ -29,8 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.Test", "test\Bizer.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.Services.Test", "test\Bizer.Services.Test\Bizer.Services.Test.csproj", "{296FDB6A-9FCC-4A00-92DD-DC8EC013AF91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.WebAssembly", "sample\Sample.WebAssembly\Sample.WebAssembly.csproj", "{07E7F796-8EB0-40A1-AB62-E74402590771}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{68F6FF27-ACBE-4E84-AD7A-D1144E7228A5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.Extensions.ApplicatonService.Abstractions", "src\Extensions\Bizer.Extensions.ApplicationService.Abstractions\Bizer.Extensions.ApplicatonService.Abstractions.csproj", "{2CDDF9AC-8D03-4BE0-9FFF-0D06603714DB}"
@@ -47,20 +41,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.AspNetCore", "src\Cor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bizer.Extensions.AutoInjection", "src\Extensions\Bizer.Extensions.AutoInjection\Bizer.Extensions.AutoInjection.csproj", "{57BF1ADC-002A-462B-8DB8-0F58773925E6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Contracts", "sample\Sample.Contracts\Sample.Contracts.csproj", "{F6BB5AD5-166A-4D9C-B761-C902E854F105}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Contracts.Impl", "sample\Sample.Contracts.Impl\Sample.Contracts.Impl.csproj", "{08FC4977-45C8-4F73-B57F-A65B3219F0DE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.WebApi", "sample\Sample.WebApi\Sample.WebApi.csproj", "{4F6C5458-79B4-4333-8695-74E399FF975E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D9EC8968-B009-4E34-902F-9F253039E46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9EC8968-B009-4E34-902F-9F253039E46E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9EC8968-B009-4E34-902F-9F253039E46E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9EC8968-B009-4E34-902F-9F253039E46E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D280B47D-A729-45B0-9364-73280314BE68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D280B47D-A729-45B0-9364-73280314BE68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D280B47D-A729-45B0-9364-73280314BE68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D280B47D-A729-45B0-9364-73280314BE68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F04B58B7-0F94-421F-B85B-B7F0038572D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F04B58B7-0F94-421F-B85B-B7F0038572D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F04B58B7-0F94-421F-B85B-B7F0038572D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,10 +69,6 @@ Global
 		{296FDB6A-9FCC-4A00-92DD-DC8EC013AF91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{296FDB6A-9FCC-4A00-92DD-DC8EC013AF91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{296FDB6A-9FCC-4A00-92DD-DC8EC013AF91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07E7F796-8EB0-40A1-AB62-E74402590771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07E7F796-8EB0-40A1-AB62-E74402590771}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07E7F796-8EB0-40A1-AB62-E74402590771}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07E7F796-8EB0-40A1-AB62-E74402590771}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2CDDF9AC-8D03-4BE0-9FFF-0D06603714DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CDDF9AC-8D03-4BE0-9FFF-0D06603714DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2CDDF9AC-8D03-4BE0-9FFF-0D06603714DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -105,18 +93,27 @@ Global
 		{57BF1ADC-002A-462B-8DB8-0F58773925E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57BF1ADC-002A-462B-8DB8-0F58773925E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57BF1ADC-002A-462B-8DB8-0F58773925E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6BB5AD5-166A-4D9C-B761-C902E854F105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6BB5AD5-166A-4D9C-B761-C902E854F105}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6BB5AD5-166A-4D9C-B761-C902E854F105}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6BB5AD5-166A-4D9C-B761-C902E854F105}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08FC4977-45C8-4F73-B57F-A65B3219F0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08FC4977-45C8-4F73-B57F-A65B3219F0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08FC4977-45C8-4F73-B57F-A65B3219F0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08FC4977-45C8-4F73-B57F-A65B3219F0DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F6C5458-79B4-4333-8695-74E399FF975E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F6C5458-79B4-4333-8695-74E399FF975E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F6C5458-79B4-4333-8695-74E399FF975E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F6C5458-79B4-4333-8695-74E399FF975E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D9EC8968-B009-4E34-902F-9F253039E46E} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
-		{D280B47D-A729-45B0-9364-73280314BE68} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
 		{F04B58B7-0F94-421F-B85B-B7F0038572D6} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
 		{D4BEC1DE-5B59-4E24-A7CB-FC69F0CBAF0A} = {465170C5-FA92-4B83-A3F4-4B970B8E29D5}
 		{946EB630-71A0-45BA-8F3A-11113AFF7A5D} = {465170C5-FA92-4B83-A3F4-4B970B8E29D5}
 		{296FDB6A-9FCC-4A00-92DD-DC8EC013AF91} = {465170C5-FA92-4B83-A3F4-4B970B8E29D5}
-		{07E7F796-8EB0-40A1-AB62-E74402590771} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
 		{68F6FF27-ACBE-4E84-AD7A-D1144E7228A5} = {36920AB0-7BBF-420E-BE8F-8E1E99AC16E4}
 		{2CDDF9AC-8D03-4BE0-9FFF-0D06603714DB} = {68F6FF27-ACBE-4E84-AD7A-D1144E7228A5}
 		{CAC92440-534D-4875-8CA3-306C5EA73F44} = {68F6FF27-ACBE-4E84-AD7A-D1144E7228A5}
@@ -125,6 +122,9 @@ Global
 		{EF37C08F-8068-4B31-AA5A-A1423DCE83DB} = {487826EC-7805-4FC9-94E9-5FC65D7C52E6}
 		{7C858160-E19B-419E-813B-473F8D52FE39} = {487826EC-7805-4FC9-94E9-5FC65D7C52E6}
 		{57BF1ADC-002A-462B-8DB8-0F58773925E6} = {68F6FF27-ACBE-4E84-AD7A-D1144E7228A5}
+		{F6BB5AD5-166A-4D9C-B761-C902E854F105} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
+		{08FC4977-45C8-4F73-B57F-A65B3219F0DE} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
+		{4F6C5458-79B4-4333-8695-74E399FF975E} = {19BDE7E5-138D-4975-AC1F-94DC9FD92014}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F0F12E82-F4B7-48EB-9DE7-4F2F7040E14A}

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ public class AccountApplicationService : IAccountService
 配置服务
 ```diff
 builder.Services
-	.AddBizer(options => options.AddAssembly(typeof(IAccountService).Assembly)) //要扫描的程序集
+	.AddBizer(options => options.AddAssembly(typeof(AccountService).Assembly)) //接口实现类所在的程序集
 +	.AddDynamicWebApi(); //将扫描到的程序集的接口和实现秒变动态 WEB API 服务
 ```
 

diff --git a/common.props b/common.props
@@ -6,7 +6,7 @@
 		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.8</Version>
+		<VersionSuffix>preview1</VersionSuffix>
 		<Authors>playermaker</Authors>
 		<Copyright>playermaker（最高指挥官） © 2023-2025</Copyright>
 		<PackageIcon>icon.png</PackageIcon>

diff --git a/sample/BlazorAppTest/Client/App.razor b/sample/BlazorAppTest/Client/App.razor
diff --git a/sample/BlazorAppTest/Client/BlazorAppTest.Client.csproj b/sample/BlazorAppTest/Client/BlazorAppTest.Client.csproj
diff --git a/sample/BlazorAppTest/Client/MainLayout.razor b/sample/BlazorAppTest/Client/MainLayout.razor
diff --git a/sample/BlazorAppTest/Client/Pages/Index.razor b/sample/BlazorAppTest/Client/Pages/Index.razor
diff --git a/sample/BlazorAppTest/Client/Program.cs b/sample/BlazorAppTest/Client/Program.cs
diff --git a/sample/BlazorAppTest/Client/Properties/launchSettings.json b/sample/BlazorAppTest/Client/Properties/launchSettings.json
diff --git a/sample/BlazorAppTest/Client/_Imports.razor b/sample/BlazorAppTest/Client/_Imports.razor
diff --git a/sample/BlazorAppTest/Client/wwwroot/css/app.css b/sample/BlazorAppTest/Client/wwwroot/css/app.css