Browse Source

SqlServer优先使用驱动System.Data.SqlClient

pull/91/head
大石头 4 years ago
parent
commit
209e298973
  1. BIN
      DLL/SqlServer/System.Data.SqlClient.win-x64.zip
  2. BIN
      DLL/SqlServer/System.Data.SqlClient.win-x86.zip
  3. 6
      Test/Program.cs
  4. 2
      Test/Properties/PublishProfiles/FolderProfile.pubxml
  5. 12
      Test/Test.csproj
  6. 4
      Test/appsettings.json
  7. 2
      XCode/DataAccessLayer/Common/DbBase.cs
  8. 4
      XCode/DataAccessLayer/Database/SqlServer.cs

BIN
DLL/SqlServer/System.Data.SqlClient.win-x64.zip

BIN
DLL/SqlServer/System.Data.SqlClient.win-x86.zip

6
Test/Program.cs

@ -79,7 +79,7 @@ namespace Test
try
{
#endif
Test3();
Test7();
#if !DEBUG
}
catch (Exception ex)
@ -447,6 +447,10 @@ namespace Test
//Role.Meta.Session.Dal.Db.Migration = Migration.Full;
//DAL.AddConnStr("membership", "Server=10.0.0.3;Port=3306;Database=Membership;Uid=root;Pwd=Pass@word;", null, "mysql");
var dal = Role.Meta.Session.Dal;
XTrace.WriteLine("dal={0}", dal.DbType);
XTrace.WriteLine("db={0}", dal.Db.ServerVersion);
Role.Meta.Session.Dal.Db.ShowSQL = true;
Role.Meta.Session.Dal.Expire = 10;
//Role.Meta.Session.Dal.Db.Readonly = true;

2
Test/Properties/PublishProfiles/FolderProfile.pubxml

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PublishDir>..\..\Test\publish\</PublishDir>
<SelfContained>false</SelfContained>
</PropertyGroup>

12
Test/Test.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net45;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net461;net5.0;net6.0</TargetFrameworks>
<OutputPath>..\..\Test\</OutputPath>
<LangVersion>latest</LangVersion>
<Version>1.0.0.1130</Version>
@ -51,16 +51,8 @@
<ItemGroup>
<Folder Include="Model\" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="MathNet.Numerics">
<Version>5.0.0-alpha02</Version>
</PackageReference>
<PackageReference Include="Microsoft.Data.SqlClient">
<Version>3.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Stardust" Version="1.5.2021.1001" />
<PackageReference Include="NewLife.Stardust" Version="1.5.2021.1109" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="del &quot;$(TargetDir)*.xml&quot; /q" />

4
Test/appsettings.json

@ -7,6 +7,10 @@
//
//
},
"sqlserver": {
"connectionString": "Server=127.0.0.1;Database=Membership;Uid=root;Pwd=root;",
"providerName": "SqlServer"
},
"MySQL.AppSettings.default": {
/*"connectionString": "Server=.;Port=3306;Database=mysql;Uid=MySQL.default;Pwd=;",*/
/*"providerName": "MySql.Data.MySqlClient"*/

2
XCode/DataAccessLayer/Common/DbBase.cs

@ -359,7 +359,7 @@ namespace XCode.DataAccessLayer
if (type == null)
{
XTrace.WriteLine("驱动文件{0}无效或不适用于当前环境,准备删除后重新下载!", assemblyFile);
XTrace.WriteLine("驱动文件[{0}]无效或不适用于当前环境,准备删除后重新加载[{1}]!", assemblyFile, file);
try
{

4
XCode/DataAccessLayer/Database/SqlServer.cs

@ -31,8 +31,8 @@ namespace XCode.DataAccessLayer
{
lock (typeof(SqlServer))
{
if (_Factory == null) _Factory = GetProviderFactory("Microsoft.Data.SqlClient.dll", "Microsoft.Data.SqlClient.SqlClientFactory", false, true);
if (_Factory == null) _Factory = GetProviderFactory(null, "System.Data.SqlClient.SqlClientFactory");
//if (_Factory == null) _Factory = GetProviderFactory("Microsoft.Data.SqlClient.dll", "Microsoft.Data.SqlClient.SqlClientFactory", false, true);
if (_Factory == null) _Factory = GetProviderFactory("System.Data.SqlClient.dll", "System.Data.SqlClient.SqlClientFactory");
}
}

Loading…
Cancel
Save