merge: 合并代码

Author: jianxuanbing

framework.props

@@ -4,32 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <RootNamespace/>
-    <LangVersion>latest</LangVersion>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>$(MSBuildThisFileDirectory)/output/debug/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>$(MSBuildThisFileDirectory)/output/release/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <Import Project="asset/props/package.props"/>
-
-  <Import Project="asset/props/misc.props"/>
-
   <Import Project="./common.props"/>
 
 

framework/tests/Bing.Tests/Domains/ValidTest.cs

@@ -1,4 +1,5 @@
 using System;
+using AspectCore.DynamicProxy.Parameters;
 using AspectCore.Extensions.DependencyInjection;
 using Bing.DependencyInjection;
 using Bing.Exceptions;
@@ -26,7 +27,10 @@ public ValidTest()
         {
             var services = new ServiceCollection();
             services.AddScoped<IRepositorySample, RepositorySample>();
-            services.EnableAop();
+            services.EnableAop(x =>
+            {
+                x.EnableParameterAspect();
+            });
             _serviceProvider = services.BuildServiceContextProvider();
         }
 

tests/Bing.Tests.Samples/Bing.Tests.Samples.csproj

@@ -27,4 +27,9 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="3.1.10" />
+    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.10" />
+  </ItemGroup>
+
 </Project>

tests/Bing.Tests.Samples/Bing/Tests/Samples/AggregateRootSample.cs

@@ -42,7 +42,7 @@ public AggregateRootSample() : this(Guid.Empty) { }
         /// <summary>
         /// 手机号
         /// </summary>
-        [Display(Name = "手机号")]
+        [Display(Description = "手机号")]
         public string MobilePhone { get; set; }
 
         /// <summary>

version.props

@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>1</VersionMajor>
-    <VersionMinor>2</VersionMinor>
-    <VersionPatch>2</VersionPatch>
-    <VersionQuality>20201217-1</VersionQuality>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionPatch>0</VersionPatch>
+    <VersionQuality>20210102-1</VersionQuality>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
   </PropertyGroup>