Merge remote-tracking branch 'origin/dev_3.1' into feature/dev_3.1-add_logging

jianxuanbing · jianxuanbing · commit 68c962967ddb · 2021-11-30T17:23:13.000+08:00
diff --git a/framework/src/Bing.AspNetCore.Mvc.UI/project.dependency.props b/framework/src/Bing.AspNetCore.Mvc.UI/project.dependency.props
@@ -1,6 +1,6 @@
 ﻿<Project>
   <ItemGroup>
-    <PackageReference Include="Bing.Utils.Http" Version="1.2.4" />
+    <PackageReference Include="Bing.Utils.Http" Version="$(BingUtilsPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
diff --git a/framework/src/Bing/Bing/DisposeAction.cs b/framework/src/Bing/Bing/DisposeAction.cs
diff --git a/framework/src/Bing/Bing/NullDisposable.cs b/framework/src/Bing/Bing/NullDisposable.cs
diff --git a/framework/src/Bing/project.dependency.props b/framework/src/Bing/project.dependency.props
@@ -6,7 +6,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.9" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-    <PackageReference Include="Bing.Utils" Version="1.2.4" />
+    <PackageReference Include="Bing.Utils" Version="$(BingUtilsPackageVersion)" />
 
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftPackageVersion)" />
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/MySql/MySqlBuilderTest.Join.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/MySql/MySqlBuilderTest.Join.cs
@@ -1,7 +1,5 @@
 ﻿using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/MySql/MySqlBuilderTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/MySql/MySqlBuilderTest.cs
@@ -1,6 +1,5 @@
 ﻿using Bing.Datas.Dapper.MySql;
 using Bing.Data.Sql;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/Oracle/OracleBuilderTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/Oracle/OracleBuilderTest.cs
@@ -1,8 +1,6 @@
 ﻿using Bing.Datas.Dapper.Oracle;
 using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/PgSql/PgSqlBuilderTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/PgSql/PgSqlBuilderTest.cs
@@ -1,6 +1,5 @@
 ﻿using Bing.Datas.Dapper.PgSql;
 using Bing.Data.Sql;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/JoinClauseTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/JoinClauseTest.cs
@@ -1,10 +1,7 @@
-﻿using System;
-using Bing.Datas.Dapper.SqlServer;
+﻿using Bing.Datas.Dapper.SqlServer;
 using Bing.Data.Sql.Builders.Clauses;
 using Bing.Data.Sql.Builders.Core;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs
@@ -9,7 +9,6 @@
 using Bing.Data.Test.Integration.Samples;
 using Bing.Data.Test.Integration.Sql.Builders.Samples;
 using Bing.Data.Test.Integration.XUnitHelpers;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.From.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.From.cs
@@ -1,6 +1,5 @@
 ﻿using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.GroupBy.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.GroupBy.cs
@@ -1,7 +1,5 @@
-﻿using System;
-using Bing.Data.Sql;
+﻿using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.Join.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.Join.cs
@@ -1,8 +1,5 @@
-﻿using System;
-using Bing.Data.Sql;
+﻿using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.OrderBy.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.OrderBy.cs
@@ -1,7 +1,5 @@
-﻿using System;
-using Bing.Data.Sql;
+﻿using Bing.Data.Sql;
 using Bing.Data.Test.Integration.Samples;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.Where.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.Where.cs
@@ -4,8 +4,6 @@
 using Bing.Data.Sql.Builders.Conditions;
 using Bing.Data.Test.Integration.Samples;
 using Bing.Logs;
-using Bing.Utils;
-using Bing.Utils.Helpers;
 using Xunit;
 using Str = Bing.Helpers.Str;
 
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/SqlServerBuilderTest.cs
@@ -6,7 +6,6 @@
 using Bing.Data.Test.Integration.Samples;
 using Bing.Data.Test.Integration.XUnitHelpers;
 using Bing.Properties;
-using Bing.Utils.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Str = Bing.Helpers.Str;
diff --git a/version.dev.props b/version.dev.props
@@ -2,5 +2,6 @@
   <PropertyGroup>
     <!-- All Microsoft packages -->
     <MicrosoftPackageVersion>3.1.*</MicrosoftPackageVersion>
+    <BingUtilsPackageVersion>1.2.5</BingUtilsPackageVersion>
   </PropertyGroup>
 </Project>
