Skip to content

Commit 6cffb34

Browse files
authored
Merge pull request #60 from bing-framework/dev_3.1
发布 2.2.4
2 parents 575d679 + d7f77fd commit 6cffb34

File tree

322 files changed

+6857
-2652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+6857
-2652
lines changed

Bing.All.sln

Lines changed: 65 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.MiniProfiler", "framework\src\Bing.MiniProfiler\Bing.MiniProfiler.csproj", "{43BE3B85-AA7B-47B5-AC09-EE66B52358EA}"
5151
EndProject
5252
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_SolutionItems", "{2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}"
53-
ProjectSection(SolutionItems) = preProject
54-
.editorconfig = .editorconfig
55-
.gitattributes = .gitattributes
56-
.gitignore = .gitignore
57-
common.props = common.props
58-
Directory.Build.targets = Directory.Build.targets
59-
framework.props = framework.props
60-
LICENSE = LICENSE
61-
README.md = README.md
62-
version.dev.props = version.dev.props
63-
version.props = version.props
64-
EndProjectSection
6553
EndProject
6654
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6690993E-6659-451F-907C-A48FE1121D40}"
6755
ProjectSection(SolutionItems) = preProject
@@ -89,9 +77,6 @@ EndProject
8977
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01-admin", "01-admin", "{BDBABE46-FAAE-459D-BC78-B5BA6503EBBA}"
9078
EndProject
9179
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-tests", "02-tests", "{5C7976B4-C243-41B9-8303-8E8FAE099D31}"
92-
ProjectSection(SolutionItems) = preProject
93-
framework\tests\Directory.Build.props = framework\tests\Directory.Build.props
94-
EndProjectSection
9580
EndProject
9681
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.AutoMapper.Tests", "framework\tests\Bing.AutoMapper.Tests\Bing.AutoMapper.Tests.csproj", "{741EE94D-5F03-426E-9D34-CBDA41671742}"
9782
EndProject
@@ -111,8 +96,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Ddd.Application", "fra
11196
EndProject
11297
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Ddd.Application.Contracts", "framework\src\Bing.Ddd.Application.Contracts\Bing.Ddd.Application.Contracts.csproj", "{577D3EA3-5342-4E0D-AE51-39CBEE217089}"
11398
EndProject
114-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Validation.Abstractions", "framework\src\Bing.Validation.Abstractions\Bing.Validation.Abstractions.csproj", "{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}"
115-
EndProject
11699
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Auditing", "framework\src\Bing.Auditing\Bing.Auditing.csproj", "{F084AFFB-9136-43CE-874C-777DBA4D5205}"
117100
EndProject
118101
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Emailing", "framework\src\Bing.Emailing\Bing.Emailing.csproj", "{5D81881D-FF17-4902-8BEB-A1D58D0EF688}"
@@ -190,6 +173,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{D77F42E0
190173
ProjectSection(SolutionItems) = preProject
191174
asset\props\misc.props = asset\props\misc.props
192175
asset\props\package.props = asset\props\package.props
176+
asset\props\sourcelink.env.props = asset\props\sourcelink.env.props
193177
EndProjectSection
194178
EndProject
195179
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Admin.Data.FreeSQL", "modules\admin\src\Bing.Admin.Data.FreeSQL\Bing.Admin.Data.FreeSQL.csproj", "{05DFA67F-C861-48F9-BBD9-7777972A918F}"
@@ -242,6 +226,45 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Logging.Tests", "frame
242226
EndProject
243227
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Logging.Serilog.Tests", "framework\tests\Bing.Logging.Serilog.Tests\Bing.Logging.Serilog.Tests.csproj", "{857BF156-74BE-4D71-8814-A1ECAA958C2D}"
244228
EndProject
229+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Validation.Abstractions", "framework\src\Bing.Validation.Abstractions\Bing.Validation.Abstractions.csproj", "{19A3A852-6F7B-4864-8F53-AE91A04D0732}"
230+
EndProject
231+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Aop.AspectCore", "framework\src\Bing.Aop.AspectCore\Bing.Aop.AspectCore.csproj", "{E7D1CB89-9657-44EC-8531-4C1B956D190E}"
232+
EndProject
233+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-tests", "02-tests", "{FA7995A9-43C6-405A-B924-E4F182C245C2}"
234+
EndProject
235+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Biz.Payments.Tests", "components\tests\Bing.Biz.Payments.Tests\Bing.Biz.Payments.Tests.csproj", "{F41CF4E3-DB29-42C2-8999-39880376D862}"
236+
EndProject
237+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{3EE7B5A9-FF9B-4786-9E0F-AFD2BED68CC2}"
238+
ProjectSection(SolutionItems) = preProject
239+
asset\images\icon.png = asset\images\icon.png
240+
EndProjectSection
241+
EndProject
242+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7ABB7FBC-A1B9-432F-BCC5-53B9FD0172D8}"
243+
ProjectSection(SolutionItems) = preProject
244+
README.md = README.md
245+
EndProjectSection
246+
EndProject
247+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{4A87040E-99A6-4A3F-BD6D-D2A3C3663012}"
248+
ProjectSection(SolutionItems) = preProject
249+
framework\Publish.bat = framework\Publish.bat
250+
framework\UnPublish.bat = framework\UnPublish.bat
251+
EndProjectSection
252+
EndProject
253+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{B6E2B626-F561-4B47-8CFE-E8A305696522}"
254+
ProjectSection(SolutionItems) = preProject
255+
.editorconfig = .editorconfig
256+
.gitattributes = .gitattributes
257+
.gitignore = .gitignore
258+
common.props = common.props
259+
common.tests.props = common.tests.props
260+
framework.props = framework.props
261+
LICENSE = LICENSE
262+
version.dev.props = version.dev.props
263+
version.props = version.props
264+
EndProjectSection
265+
EndProject
266+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bing.Uow", "framework\src\Bing.Uow\Bing.Uow.csproj", "{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}"
267+
EndProject
245268
Global
246269
GlobalSection(SolutionConfigurationPlatforms) = preSolution
247270
Debug|Any CPU = Debug|Any CPU
@@ -396,10 +419,6 @@ Global
396419
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Debug|Any CPU.Build.0 = Debug|Any CPU
397420
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Release|Any CPU.ActiveCfg = Release|Any CPU
398421
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Release|Any CPU.Build.0 = Release|Any CPU
399-
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
400-
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Debug|Any CPU.Build.0 = Debug|Any CPU
401-
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Release|Any CPU.ActiveCfg = Release|Any CPU
402-
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Release|Any CPU.Build.0 = Release|Any CPU
403422
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
404423
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Debug|Any CPU.Build.0 = Debug|Any CPU
405424
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -552,6 +571,22 @@ Global
552571
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
553572
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
554573
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Release|Any CPU.Build.0 = Release|Any CPU
574+
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
575+
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Debug|Any CPU.Build.0 = Debug|Any CPU
576+
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Release|Any CPU.ActiveCfg = Release|Any CPU
577+
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Release|Any CPU.Build.0 = Release|Any CPU
578+
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
579+
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Debug|Any CPU.Build.0 = Debug|Any CPU
580+
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Release|Any CPU.ActiveCfg = Release|Any CPU
581+
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Release|Any CPU.Build.0 = Release|Any CPU
582+
{F41CF4E3-DB29-42C2-8999-39880376D862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
583+
{F41CF4E3-DB29-42C2-8999-39880376D862}.Debug|Any CPU.Build.0 = Debug|Any CPU
584+
{F41CF4E3-DB29-42C2-8999-39880376D862}.Release|Any CPU.ActiveCfg = Release|Any CPU
585+
{F41CF4E3-DB29-42C2-8999-39880376D862}.Release|Any CPU.Build.0 = Release|Any CPU
586+
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
587+
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
588+
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
589+
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Release|Any CPU.Build.0 = Release|Any CPU
555590
EndGlobalSection
556591
GlobalSection(SolutionProperties) = preSolution
557592
HideSolutionNode = FALSE
@@ -599,7 +634,6 @@ Global
599634
{25107D91-1E7D-422C-8B03-B1C94EE3A1B5} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
600635
{CAC738F2-8F95-4940-90D2-76DABF403581} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
601636
{577D3EA3-5342-4E0D-AE51-39CBEE217089} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
602-
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446} = {472FFE79-B8B1-41A1-91F2-CFA0F8406BC9}
603637
{F084AFFB-9136-43CE-874C-777DBA4D5205} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
604638
{5D81881D-FF17-4902-8BEB-A1D58D0EF688} = {B8142AAE-3792-44C0-9197-0F14A9749E33}
605639
{256EB128-60DC-406C-BED0-9D0013A6B49A} = {052D4342-8B65-4836-A9B6-681A7812760E}
@@ -659,6 +693,15 @@ Global
659693
{C7E17279-AAEB-4A58-BBBB-AF443F924D9E} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
660694
{73871EF9-9CF6-479F-BC1C-AD443CE037AE} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
661695
{857BF156-74BE-4D71-8814-A1ECAA958C2D} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
696+
{19A3A852-6F7B-4864-8F53-AE91A04D0732} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
697+
{E7D1CB89-9657-44EC-8531-4C1B956D190E} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
698+
{FA7995A9-43C6-405A-B924-E4F182C245C2} = {8E2070BF-F6CF-47CC-8DB8-56B74EDFA7EB}
699+
{F41CF4E3-DB29-42C2-8999-39880376D862} = {FA7995A9-43C6-405A-B924-E4F182C245C2}
700+
{3EE7B5A9-FF9B-4786-9E0F-AFD2BED68CC2} = {F40A8736-2FEC-446A-99FD-3660729893FC}
701+
{7ABB7FBC-A1B9-432F-BCC5-53B9FD0172D8} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
702+
{4A87040E-99A6-4A3F-BD6D-D2A3C3663012} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
703+
{B6E2B626-F561-4B47-8CFE-E8A305696522} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
704+
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
662705
EndGlobalSection
663706
GlobalSection(ExtensibilityGlobals) = postSolution
664707
SolutionGuid = {C1202A0F-83CC-4602-BCE5-20CB640BCAD4}

Directory.Build.targets

Lines changed: 0 additions & 16 deletions
This file was deleted.

asset/props/sourcelink.env.props

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
3+
<ItemGroup>
4+
<PackageReference Include="DotNetCore.SourceLink.Environment">
5+
<Version Condition=" '$(TargetFramework)' == 'net48' ">2.2.0</Version>
6+
<Version Condition=" '$(TargetFramework)' == 'net472' ">2.2.0</Version>
7+
<Version Condition=" '$(TargetFramework)' == 'net462' ">2.2.0</Version>
8+
<Version Condition=" '$(TargetFramework)' == 'net452' ">2.2.0</Version>
9+
<Version Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.2.0</Version>
10+
<Version Condition=" '$(TargetFramework)' == 'netstandard2.1' ">2.2.0</Version>
11+
<Version Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</Version>
12+
<Version Condition=" '$(TargetFramework)' == 'net5.0' ">3.1.0</Version>
13+
<Version Condition=" '$(TargetFramework)' == 'net6.0' ">3.1.0</Version>
14+
</PackageReference>
15+
</ItemGroup>
16+
17+
</Project>

common.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
2-
32
<PropertyGroup>
43
<RootNamespace/>
54
<LangVersion>latest</LangVersion>
6-
<NoWarn>$(NoWarn);CS1591</NoWarn>
5+
<NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);NETSDK1138</NoWarn>
6+
<NoWarn Condition=" '$(Configuration)' == 'Release' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
77
</PropertyGroup>
88

99
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22,6 +22,8 @@
2222
<DocumentationFile>$(AssemblyName).xml</DocumentationFile>
2323
</PropertyGroup>
2424

25+
<Import Project="asset/props/sourcelink.env.props"/>
26+
2527
<Import Project="asset/props/package.props"/>
2628

2729
<Import Project="asset/props/misc.props"/>

common.tests.props

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>latest</LangVersion>
4+
<NoWarn>$(NoWarn);CS1591</NoWarn>
5+
<IsPackable>false</IsPackable>
6+
</PropertyGroup>
7+
8+
<!--单元测试基础配置-->
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
11+
<PackageReference Include="xunit" Version="2.4.2" />
12+
<PackageReference Include="xunit.runner.visualstudio">
13+
<Version Condition=" '$(TargetFramework)' != 'net452' ">2.4.5</Version>
14+
<Version Condition=" '$(TargetFramework)' == 'net452' ">2.4.3</Version>
15+
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">2.4.3</Version>
16+
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.4.3</Version>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
<PrivateAssets>all</PrivateAssets>
19+
</PackageReference>
20+
</ItemGroup>
21+
22+
<Import Project="asset/props/sourcelink.env.props"/>
23+
</Project>

components/src/Bing.Biz.OAuthLogin/Bing.Biz.OAuthLogin.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ Bing是一个.net core平台下的应用框架,旨在于提升小型团队的
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
10+
<PackageReference Include="Bing.Utils.Http" Version="1.4.0-preview-20220831-2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
1414
<ProjectReference Include="..\..\..\framework\src\Bing.AutoMapper\Bing.AutoMapper.csproj" />
1515
<ProjectReference Include="..\..\..\framework\src\Bing.Logs\Bing.Logs.csproj" />
16+
<ProjectReference Include="..\..\..\framework\src\Bing.Validation\Bing.Validation.csproj" />
1617
<ProjectReference Include="..\..\..\framework\src\Bing\Bing.csproj" />
1718
</ItemGroup>
1819

components/src/Bing.Biz.OAuthLogin/Core/AccessTokenParam.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using System.ComponentModel.DataAnnotations;
22
using System.Linq;
33
using Bing.Exceptions;
4-
using Bing.Validations;
4+
using Bing.Validation;
55

66
namespace Bing.Biz.OAuthLogin.Core
77
{
88
/// <summary>
99
/// 访问令牌参数
1010
/// </summary>
11-
public class AccessTokenParam : IValidation
11+
public class AccessTokenParam : IVerifyModel
1212
{
1313
/// <summary>
1414
/// 授权类型
@@ -31,7 +31,7 @@ public class AccessTokenParam : IValidation
3131
/// <summary>
3232
/// 验证
3333
/// </summary>
34-
public virtual ValidationResultCollection Validate()
34+
public virtual IValidationResult Validate()
3535
{
3636
var result = DataAnnotationValidation.Validate(this);
3737
if (result.IsValid)

components/src/Bing.Biz.OAuthLogin/Core/AuthorizationConfigBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.ComponentModel.DataAnnotations;
22
using System.Linq;
33
using Bing.Exceptions;
4-
using Bing.Validations;
4+
using Bing.Validation;
55

66
namespace Bing.Biz.OAuthLogin.Core
77
{

components/src/Bing.Biz.OAuthLogin/Core/AuthorizationParamBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using System.Linq;
44
using Bing.Exceptions;
55
using Bing.ObjectMapping;
6-
using Bing.Validations;
6+
using Bing.Validation;
77

88
namespace Bing.Biz.OAuthLogin.Core
99
{
1010
/// <summary>
1111
/// 授权参数基类
1212
/// </summary>
13-
public class AuthorizationParamBase : IValidation
13+
public class AuthorizationParamBase : IVerifyModel
1414
{
1515
/// <summary>
1616
/// 授权类型
@@ -45,7 +45,7 @@ private void InitState()
4545
/// <summary>
4646
/// 验证
4747
/// </summary>
48-
public virtual ValidationResultCollection Validate()
48+
public virtual IValidationResult Validate()
4949
{
5050
var result = DataAnnotationValidation.Validate(this);
5151
if (result.IsValid)

components/src/Bing.Biz.OAuthLogin/Core/AuthorizationUserParamBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
using System.Linq;
33
using Bing.Exceptions;
44
using Bing.ObjectMapping;
5-
using Bing.Validations;
5+
using Bing.Validation;
66

77
namespace Bing.Biz.OAuthLogin.Core
88
{
99
/// <summary>
1010
/// 授权用户参数基类
1111
/// </summary>
12-
public class AuthorizationUserParamBase : IValidation
12+
public class AuthorizationUserParamBase : IVerifyModel
1313
{
1414
/// <summary>
1515
/// 访问令牌
@@ -20,7 +20,7 @@ public class AuthorizationUserParamBase : IValidation
2020
/// <summary>
2121
/// 验证
2222
/// </summary>
23-
public ValidationResultCollection Validate()
23+
public IValidationResult Validate()
2424
{
2525
var result = DataAnnotationValidation.Validate(this);
2626
if (result.IsValid)

0 commit comments

Comments
 (0)