Merge pull request #66 from bing-framework/dev_3.1

发布 2.2.9

Author: jianxuanbing

Bing.All.sln

@@ -51,11 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.MiniProfiler", "framew
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_SolutionItems", "{2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6690993E-6659-451F-907C-A48FE1121D40}"
-	ProjectSection(SolutionItems) = preProject
-		build\common.props = build\common.props
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03-modules", "03-modules", "{4A4E88DE-5CE7-433E-BED8-D269E385ECFD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Admin.Infrastructure", "modules\admin\src\Bing.Admin.Infrastructure\Bing.Admin.Infrastructure.csproj", "{8C24C67A-DFF6-4752-827F-98BE6190EF47}"
@@ -145,7 +140,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03-DDD", "03-DDD", "{AED4D9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04-ORM", "04-ORM", "{93A682FB-8EA0-4F10-AC03-CD688025E624}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-Logs", "02-Logs", "{33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-Logging", "02-Logging", "{33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Core", "00-Core", "{C6B2743E-B7EE-418C-9F9B-79976B71C46B}"
 EndProject
@@ -264,7 +259,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Uow", "framework\src\B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.AspNetCore.Serilog", "framework\src\Bing.AspNetCore.Serilog\Bing.AspNetCore.Serilog.csproj", "{46718841-DF9E-41A4-AF87-C8E81AAE6F55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bing.Authorization.Abstractions", "framework\src\Bing.Authorization.Abstractions\Bing.Authorization.Abstractions.csproj", "{4B50588D-013B-462C-AA1E-169BEDBA206E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Authorization.Abstractions", "framework\src\Bing.Authorization.Abstractions\Bing.Authorization.Abstractions.csproj", "{4B50588D-013B-462C-AA1E-169BEDBA206E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{D8DF6590-127F-4C22-A3F0-DAEBFC5ECACB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{C50E2610-AC8B-45FD-AC25-9BC6C2EE4332}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging", "Logging", "{92EDE4B9-54BD-423A-991B-342ABB54BE8A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logs", "Logs", "{FB4CF257-BC99-4D38-AD74-061307A2C3F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Caching.FreeRedis.Tests.Integration", "framework\tests\Bing.Caching.FreeRedis.Tests.Integration\Bing.Caching.FreeRedis.Tests.Integration.csproj", "{0E0BF260-8723-44B0-BEBD-7C345F044A34}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching", "Caching", "{52F64CF7-927F-4D55-A908-9E2239B4E5AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Auditing", "Auditing", "{98340528-C7CB-4503-96F3-7CE090622C2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Auditing.Contracts", "framework\src\Bing.Auditing.Contracts\Bing.Auditing.Contracts.csproj", "{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -592,6 +603,14 @@ Global
 		{4B50588D-013B-462C-AA1E-169BEDBA206E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B50588D-013B-462C-AA1E-169BEDBA206E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B50588D-013B-462C-AA1E-169BEDBA206E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E0BF260-8723-44B0-BEBD-7C345F044A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E0BF260-8723-44B0-BEBD-7C345F044A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E0BF260-8723-44B0-BEBD-7C345F044A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E0BF260-8723-44B0-BEBD-7C345F044A34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -600,11 +619,11 @@ Global
 		{472FFE79-B8B1-41A1-91F2-CFA0F8406BC9} = {A3E29077-2385-4F4F-B2BB-01975E24979C}
 		{F573919A-D73A-4186-9E9D-9A514A5D7244} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
 		{7884D11A-8935-4BB0-B027-64EE9CC2CE33} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
-		{EA652176-7921-4F6C-9B38-C722B96D7A0E} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{EA652176-7921-4F6C-9B38-C722B96D7A0E} = {FB4CF257-BC99-4D38-AD74-061307A2C3F3}
 		{E1B69A13-88EE-4705-8604-F2E9453D0D60} = {472FFE79-B8B1-41A1-91F2-CFA0F8406BC9}
-		{4A5960C8-3EBC-4725-8751-BF96CEEE2686} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
-		{CE41595A-0FA0-4B22-9507-511C957571D8} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
-		{8B4E37FC-19DA-47B4-BE06-00E50EA354B7} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{4A5960C8-3EBC-4725-8751-BF96CEEE2686} = {FB4CF257-BC99-4D38-AD74-061307A2C3F3}
+		{CE41595A-0FA0-4B22-9507-511C957571D8} = {FB4CF257-BC99-4D38-AD74-061307A2C3F3}
+		{8B4E37FC-19DA-47B4-BE06-00E50EA354B7} = {FB4CF257-BC99-4D38-AD74-061307A2C3F3}
 		{513512D1-39CF-4F50-AFFA-40C5558C3F8A} = {93A682FB-8EA0-4F10-AC03-CD688025E624}
 		{4C99DD4C-F671-45C3-B696-E9C3BDEE667F} = {93A682FB-8EA0-4F10-AC03-CD688025E624}
 		{A5BE8634-522D-4CEC-B60C-EECCD2D0F946} = {93A682FB-8EA0-4F10-AC03-CD688025E624}
@@ -619,7 +638,6 @@ Global
 		{B72B3024-B5A6-4C42-9519-349B2D1B9DF1} = {B5285F1C-479F-43F5-B3DE-3E930516AF6D}
 		{D58C77ED-ED4B-45F1-B6C4-A14FE6B70083} = {B8142AAE-3792-44C0-9197-0F14A9749E33}
 		{43BE3B85-AA7B-47B5-AC09-EE66B52358EA} = {3030FE3D-DB8F-403D-A181-8152670827AB}
-		{6690993E-6659-451F-907C-A48FE1121D40} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
 		{8C24C67A-DFF6-4752-827F-98BE6190EF47} = {BC0DA397-CCD6-407C-B675-87E5B702318A}
 		{A8F21802-C874-4EA1-A02F-C6C0000C6284} = {525BCCB3-B4EC-4DDD-BE84-513242EEE2E8}
 		{66E249CA-9BE0-4E09-AC85-A61EB68D56F8} = {525BCCB3-B4EC-4DDD-BE84-513242EEE2E8}
@@ -634,10 +652,10 @@ Global
 		{A66F9341-005F-4FAC-BF93-D676329A34B4} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
 		{58BE2219-6694-4630-85E6-7953A608A2D6} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
 		{0F86BCCF-6A1D-41DD-A9C0-4B3BF8A840BF} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
-		{25107D91-1E7D-422C-8B03-B1C94EE3A1B5} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
-		{CAC738F2-8F95-4940-90D2-76DABF403581} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
-		{577D3EA3-5342-4E0D-AE51-39CBEE217089} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
-		{F084AFFB-9136-43CE-874C-777DBA4D5205} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
+		{25107D91-1E7D-422C-8B03-B1C94EE3A1B5} = {C50E2610-AC8B-45FD-AC25-9BC6C2EE4332}
+		{CAC738F2-8F95-4940-90D2-76DABF403581} = {D8DF6590-127F-4C22-A3F0-DAEBFC5ECACB}
+		{577D3EA3-5342-4E0D-AE51-39CBEE217089} = {D8DF6590-127F-4C22-A3F0-DAEBFC5ECACB}
+		{F084AFFB-9136-43CE-874C-777DBA4D5205} = {98340528-C7CB-4503-96F3-7CE090622C2A}
 		{5D81881D-FF17-4902-8BEB-A1D58D0EF688} = {B8142AAE-3792-44C0-9197-0F14A9749E33}
 		{256EB128-60DC-406C-BED0-9D0013A6B49A} = {052D4342-8B65-4836-A9B6-681A7812760E}
 		{027BE8C0-24D8-45BC-9A97-08B6924FB39D} = {052D4342-8B65-4836-A9B6-681A7812760E}
@@ -681,7 +699,7 @@ Global
 		{3030FE3D-DB8F-403D-A181-8152670827AB} = {472FFE79-B8B1-41A1-91F2-CFA0F8406BC9}
 		{F8BFB799-8ECB-49F6-AAA4-5B07F64DB3D9} = {3030FE3D-DB8F-403D-A181-8152670827AB}
 		{2C0C2E7B-25AC-4B48-AF62-59E3C5808AEC} = {F8BFB799-8ECB-49F6-AAA4-5B07F64DB3D9}
-		{A073A8B8-C116-4D8E-A519-DF950F68D2DA} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{A073A8B8-C116-4D8E-A519-DF950F68D2DA} = {FB4CF257-BC99-4D38-AD74-061307A2C3F3}
 		{D1131EC5-CF40-418F-8E8C-858AADDBCC7F} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
 		{7F4DAD82-FB09-445C-8EA2-0F1C50FBBA28} = {052D4342-8B65-4836-A9B6-681A7812760E}
 		{09A94120-CE45-402F-B45A-21DF04F0C226} = {3030FE3D-DB8F-403D-A181-8152670827AB}
@@ -691,9 +709,9 @@ Global
 		{8B581529-D7D2-4DCF-824A-2AAFB58F8C94} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
 		{5E8AD211-7AEF-4D9D-AFA8-C85B6F3D7C6A} = {B5285F1C-479F-43F5-B3DE-3E930516AF6D}
 		{0A5D1639-8EEE-4BC9-94A5-04F354FEFBFD} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
-		{427DC057-A61A-4D4A-9B20-30F11367AFC8} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
-		{C935C3C7-0CEB-4583-9039-114631C38989} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
-		{C7E17279-AAEB-4A58-BBBB-AF443F924D9E} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{427DC057-A61A-4D4A-9B20-30F11367AFC8} = {92EDE4B9-54BD-423A-991B-342ABB54BE8A}
+		{C935C3C7-0CEB-4583-9039-114631C38989} = {92EDE4B9-54BD-423A-991B-342ABB54BE8A}
+		{C7E17279-AAEB-4A58-BBBB-AF443F924D9E} = {92EDE4B9-54BD-423A-991B-342ABB54BE8A}
 		{73871EF9-9CF6-479F-BC1C-AD443CE037AE} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
 		{857BF156-74BE-4D71-8814-A1ECAA958C2D} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
 		{19A3A852-6F7B-4864-8F53-AE91A04D0732} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
@@ -707,6 +725,14 @@ Global
 		{659C6450-6A39-44A3-A1A5-449ECAA1AFBE} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
 		{46718841-DF9E-41A4-AF87-C8E81AAE6F55} = {052D4342-8B65-4836-A9B6-681A7812760E}
 		{4B50588D-013B-462C-AA1E-169BEDBA206E} = {472FFE79-B8B1-41A1-91F2-CFA0F8406BC9}
+		{D8DF6590-127F-4C22-A3F0-DAEBFC5ECACB} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
+		{C50E2610-AC8B-45FD-AC25-9BC6C2EE4332} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
+		{92EDE4B9-54BD-423A-991B-342ABB54BE8A} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{FB4CF257-BC99-4D38-AD74-061307A2C3F3} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
+		{0E0BF260-8723-44B0-BEBD-7C345F044A34} = {52F64CF7-927F-4D55-A908-9E2239B4E5AB}
+		{52F64CF7-927F-4D55-A908-9E2239B4E5AB} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
+		{98340528-C7CB-4503-96F3-7CE090622C2A} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
+		{3DEB20D6-4D97-41D1-BD6C-C4F63134DAD7} = {98340528-C7CB-4503-96F3-7CE090622C2A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1202A0F-83CC-4602-BCE5-20CB640BCAD4}

Publish.bat

@@ -1,5 +1,4 @@
 <Project>
-
 	<ItemGroup>
 		<PackageReference Include="DotNetCore.SourceLink.Environment">
 			<Version Condition=" '$(TargetFramework)' == 'net48'  ">2.2.0</Version>
@@ -8,10 +7,11 @@
 			<Version Condition=" '$(TargetFramework)' == 'net452' ">2.2.0</Version>
 			<Version Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.2.0</Version>
 			<Version Condition=" '$(TargetFramework)' == 'netstandard2.1' ">2.2.0</Version>
+      <Version Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.2.0</Version>
+      <Version Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">2.2.0</Version>
 			<Version Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</Version>
 			<Version Condition=" '$(TargetFramework)' == 'net5.0' ">3.1.0</Version>
 			<Version Condition=" '$(TargetFramework)' == 'net6.0' ">3.1.0</Version>
 		</PackageReference>
 	</ItemGroup>
-
 </Project>

asset/props/sourcelink.env.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace/>
     <LangVersion>latest</LangVersion>
-    <NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);NETSDK1138</NoWarn>
+    <NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
     <NoWarn Condition=" '$(Configuration)' == 'Release' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
   </PropertyGroup>
 
@@ -22,6 +22,12 @@
     <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!--移除Xml、DotSettings-->
+    <None Remove="$(AssemblyName).xml" />
+    <None Remove="$(AssemblyName).csproj.DotSettings" />
+  </ItemGroup>
+
   <Import Project="asset/props/target.feature.props"/>
 
   <Import Project="asset/props/sourcelink.env.props"/>

build/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;NETSDK1138</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

build/pack.bat

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\build\common.props"></Import>
+  <Import Project="..\..\..\common.props"></Import>
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Bing.Biz.OAuthLogin是Bing应用框架的第三方授权登录类库。

common.props

@@ -8,22 +8,5 @@ namespace Bing.Biz.OAuthLogin.Taobao.Configs
     /// </summary>
     public class TaobaoAuthorizationConfig : AuthorizationConfigBase
     {
-        /// <summary>
-        /// 应用标识
-        /// </summary>
-        [Required(ErrorMessage = "应用标识[AppId]不能为空")]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// 应用密钥
-        /// </summary>
-        [Required(ErrorMessage = "应用密钥[AppKey]不能为空")]
-        public string AppKey { get; set; }
-
-        /// <summary>
-        /// 回调地址
-        /// </summary>
-        [Required(ErrorMessage = "回调地址[CallbackUrl]不能为空")]
-        public string CallbackUrl { get; set; }
     }
 }