- 调整 FreeSql.Provider.SqlServer 引用Microsoft.Data.SqlClient #391；

28810 · 28810 · commit 072a8b7cfaad · 2020-07-27T19:39:12.000+08:00
diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
@@ -17,6 +17,7 @@
         <PackageReference Include="Dapper" Version="2.0.35" />
         <PackageReference Include="IdleBus" Version="1.3.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
@@ -79,7 +79,7 @@ public void Query()
             var t4 = g.sqlserver.Ado.Query<(int, int, string, string DateTime)>("select * from xxx");
 
             var t5 = g.sqlserver.Ado.Query<dynamic>(System.Data.CommandType.Text, "select * from xxx where Id = @Id",
-                new System.Data.SqlClient.SqlParameter("Id", 1));
+                new Microsoft.Data.SqlClient.SqlParameter("Id", 1));
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs
@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
 using System.Threading;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using kwlib;
 using System.Text;
 
diff --git a/FreeSql.Tests/FreeSql.Tests/g.cs b/FreeSql.Tests/FreeSql.Tests/g.cs
@@ -41,6 +41,7 @@ public class g
 
     static Lazy<IFreeSql> sqlserverLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
         .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3")
+        //.UseConnectionFactory(FreeSql.DataType.SqlServer, () => new Microsoft.Data.SqlClient.SqlConnection("Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;"))
         //.UseConnectionFactory(FreeSql.DataType.SqlServer, () => new System.Data.SqlClient.SqlConnection("Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;"))
         //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=192.168.164.129;uid=sa;pwd=123456;Initial Catalog=ds_shop;Pooling=true;Max Pool Size=3")
         //.UseConnectionFactory(FreeSql.DataType.SqlServer, () => new System.Data.SqlClient.SqlConnection("Data Source=192.168.164.129;uid=sa;pwd=123456;Initial Catalog=ds_shop;Pooling=true;"))
diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
-    <PackageReference Include="Npgsql.LegacyPostgis" Version="4.1.3" />
-    <PackageReference Include="Npgsql.NetTopologySuite" Version="4.1.3" />
+    <PackageReference Include="Npgsql.LegacyPostgis" Version="4.1.4" />
+    <PackageReference Include="Npgsql.NetTopologySuite" Version="4.1.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45'">
diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net451;net45;net40</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net461;net40</TargetFrameworks>
 		<Version>1.7.0-preview0722</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>ncc;YeXiangQin</Authors>
@@ -25,14 +25,17 @@
     <None Include="../../logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net451'">
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.0" />
   </ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
 	</ItemGroup>
-  
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
+    <DefineConstants>microsoft</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
     <DefineConstants>net40</DefineConstants>
   </PropertyGroup>
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
@@ -4,7 +4,11 @@
 using System;
 using System.Collections;
 using System.Data.Common;
+#if microsoft
+using Microsoft.Data.SqlClient;
+#else
 using System.Data.SqlClient;
+#endif
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -19,7 +23,9 @@ public SqlServerAdo(CommonUtils util, string masterConnectionString, string[] sl
             base._util = util;
             if (connectionFactory != null)
             {
-                MasterPool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.SqlServer, connectionFactory);
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.Sqlite, connectionFactory);
+                MasterPool = pool;
+                _CreateCommandConnection = pool.TestConnection;
                 return;
             }
             if (!string.IsNullOrEmpty(masterConnectionString))
@@ -76,8 +82,15 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             return string.Concat("'", param.ToString().Replace("'", "''"), "'");
         }
 
+        DbConnection _CreateCommandConnection;
         protected override DbCommand CreateCommand()
         {
+            if (_CreateCommandConnection != null)
+            {
+                var cmd = _CreateCommandConnection.CreateCommand();
+                cmd.Connection = null;
+                return cmd;
+            }
             return new SqlCommand();
         }
 
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
@@ -4,7 +4,11 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+#if microsoft
+using Microsoft.Data.SqlClient;
+#else
 using System.Data.SqlClient;
+#endif
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs
@@ -3,7 +3,11 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+#if microsoft
+using Microsoft.Data.SqlClient;
+#else
 using System.Data.SqlClient;
+#endif
 using System.Threading.Tasks;
 
 public static partial class FreeSqlSqlServerGlobalExtensions
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs
@@ -4,7 +4,11 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+#if microsoft
+using Microsoft.Data.SqlClient;
+#else
 using System.Data.SqlClient;
+#endif
 using System.Globalization;
 using System.Text;
 
@@ -44,7 +48,7 @@ public override DbParameter AppendParamter(List<DbParameter> _params, string par
         }
 
         public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
-            Utils.GetDbParamtersByObject<SqlParameter>(sql, obj, "@", (name, type, value) =>
+            Utils.GetDbParamtersByObject<DbParameter>(sql, obj, "@", (name, type, value) =>
             {
                 if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
                 var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void Query()`
`79`	`79`	`var t4 = g.sqlserver.Ado.Query<(int, int, string, string DateTime)>("select * from xxx");`
`80`	`80`
`81`	`81`	`var t5 = g.sqlserver.Ado.Query<dynamic>(System.Data.CommandType.Text, "select * from xxx where Id = @Id",`
`82`		`- new System.Data.SqlClient.SqlParameter("Id", 1));`
	`82`	`+ new Microsoft.Data.SqlClient.SqlParameter("Id", 1));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`[Fact]`