Upgrade the SqlClient to the Microsoft.Data.SqlClient v3.0.1 (#182)

SergeiPavlov · AlexUstinov · web-flow · commit 159dbf927e48 · 2021-11-02T21:12:22.000+05:00
Co-authored-by: AlexUstinov &lt;alex.ustinov@servicetitan.com&gt;
diff --git a/Extensions/Xtensive.Orm.Reprocessing/HandleUniqueConstraintViolationStrategy.cs b/Extensions/Xtensive.Orm.Reprocessing/HandleUniqueConstraintViolationStrategy.cs
@@ -1,4 +1,8 @@
-﻿using System.Data.SqlClient;
+﻿// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+using Microsoft.Data.SqlClient;
 using System.Transactions;
 
 namespace Xtensive.Orm.Reprocessing
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Azure/Driver.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Azure/Driver.cs
@@ -1,11 +1,11 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
 // Created:    2009.07.07
 
 using Xtensive.Sql.Info;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer.Azure
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Azure/ServerInfoProvider.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Azure/ServerInfoProvider.cs
@@ -1,11 +1,10 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
 // Created:    2009.11.09
 
-using Xtensive.Sql.Info;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer.Azure
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs
@@ -7,10 +7,10 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Driver.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Driver.cs
@@ -1,12 +1,12 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
 // Created:    2009.06.23
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using Xtensive.Sql.Info;
 
 namespace Xtensive.Sql.Drivers.SqlServer
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs
@@ -7,13 +7,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using Xtensive.Orm;
 using Xtensive.Sql.Info;
 using Xtensive.SqlServer.Resources;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs
@@ -1,12 +1,11 @@
-// Copyright (C) 2020 Xtensive LLC.
+// Copyright (C) 2020-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2020.04.10
 
 using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Data.SqlTypes;
 using Xtensive.Core;
 
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/SqlServerTypeMapper.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/SqlServerTypeMapper.cs
@@ -1,13 +1,12 @@
-﻿// Copyright (C) 2012 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+﻿// Copyright (C) 2012-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
 // Created:    2012.06.07
 
 using System;
-using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace Xtensive.Sql.Drivers.SqlServer
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Driver.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Driver.cs
@@ -1,11 +1,11 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 
 using System;
 using Xtensive.Sql.Compiler;
 using Xtensive.Sql.Info;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer.v09
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/ServerInfoProvider.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/ServerInfoProvider.cs
@@ -1,10 +1,10 @@
-// Copyright (C) 2003-2020 Xtensive LLC.
+// Copyright (C) 2009-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
 using System;
 using Xtensive.Sql.Info;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer.v09
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/TypeMapper.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/TypeMapper.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -7,7 +7,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Data.SqlTypes;
 using Xtensive.Sql.Info;
 
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v10/ServerInfoProvider.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v10/ServerInfoProvider.cs
@@ -1,12 +1,12 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Kryuchkov
 // Created:    2009.07.07
 
 using System;
 using Xtensive.Sql.Info;
-using SqlServerConnection = System.Data.SqlClient.SqlConnection;
+using SqlServerConnection = Microsoft.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer.v10
 {
diff --git a/Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj b/Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj
@@ -15,7 +15,7 @@
     <WarningLevel>2</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Orm/Xtensive.Orm.Tests.Sql/SqlServer/MSSQLTests.cs b/Orm/Xtensive.Orm.Tests.Sql/SqlServer/MSSQLTests.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2020 Xtensive LLC.
+// Copyright (C) 2008-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -3831,7 +3831,7 @@ public void Test203()
       SqlTableRef unitMeasure = SqlDml.TableRef(Catalog.Schemas["Person"].Tables["Contact"]);
       SqlInsert insert = SqlDml.Insert(unitMeasure);
 
-      Assert.Throws<System.Data.SqlClient.SqlException>(() => Assert.IsTrue(CompareExecuteNonQuery(nativeSql, insert)));
+      Assert.Throws<Microsoft.Data.SqlClient.SqlException>(() => Assert.IsTrue(CompareExecuteNonQuery(nativeSql, insert)));
     }
 
     [Test]
diff --git a/Orm/Xtensive.Orm.Tests.Sql/SqlServer/SqlDecimalTest.cs b/Orm/Xtensive.Orm.Tests.Sql/SqlServer/SqlDecimalTest.cs
@@ -1,12 +1,12 @@
-// Copyright (C) 2019-2020 Xtensive LLC.
+// Copyright (C) 2019-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Kudelin
 // Created:    2019.03.19
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Data.SqlTypes;
 using System.Diagnostics;
 using System.Globalization;
diff --git a/Orm/Xtensive.Orm.Tests/App.config b/Orm/Xtensive.Orm.Tests/App.config
@@ -276,8 +276,8 @@
     </domains>
   </CustomSessionConfigurationProblem>
   <connectionStrings>
-    <add name="Entities" connectionString="metadata=res://*/Storage.Performance.EntityCrudModel.Model.csdl|res://*/Storage.Performance.EntityCrudModel.Model.ssdl|res://*/Storage.Performance.EntityCrudModel.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=DO40-Tests;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
-    <add name="NorthwindEntities" connectionString="metadata=res://*/ObjectModel.NothwindEF.csdl|res://*/ObjectModel.NothwindEF.ssdl|res://*/ObjectModel.NothwindEF.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=.;Initial Catalog=Northwind;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
+    <add name="Entities" connectionString="metadata=res://*/Storage.Performance.EntityCrudModel.Model.csdl|res://*/Storage.Performance.EntityCrudModel.Model.ssdl|res://*/Storage.Performance.EntityCrudModel.Model.msl;provider=Microsoft.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=DO40-Tests;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
+    <add name="NorthwindEntities" connectionString="metadata=res://*/ObjectModel.NothwindEF.csdl|res://*/ObjectModel.NothwindEF.ssdl|res://*/ObjectModel.NothwindEF.msl;provider=Microsoft.Data.SqlClient;provider connection string=&quot;Data Source=.;Initial Catalog=Northwind;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
     <add name="DomainConnectionString" connectionString="Data Source=localhost;Initial Catalog=DO-Tests;Integrated Security=True;MultipleActiveResultSets=False" />
     <add name="SessionConnectionString" connectionString="Data Source=localhost;Initial Catalog=DO-Tests;Integrated Security=True;MultipleActiveResultSets=True" />
   </connectionStrings>
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0451_ConnectionInitializationSql.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0451_ConnectionInitializationSql.cs
@@ -1,4 +1,10 @@
-﻿using System.Data.SqlClient;
+﻿// Copyright (C) 2013-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+// Created by: Denis Krjuchkov
+// Created:    2013.07.02
+
+using Microsoft.Data.SqlClient;
 using NUnit.Framework;
 using Xtensive.Orm.Configuration;
 using Xtensive.Orm.Providers;
diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0537_DropDefaultConstraintBugTest.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0537_DropDefaultConstraintBugTest.cs
@@ -1,22 +1,17 @@
-// Copyright (C) 2013-2021 Xtensive LLC.
+﻿// Copyright (C) 2013-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2013.12.30
 
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using Xtensive.Orm;
 using Xtensive.Orm.Configuration;
 using Xtensive.Orm.Providers;
 using Xtensive.Orm.Upgrade;
 using Xtensive.Sql;
 using Xtensive.Sql.Drivers.SqlServer;
-using Xtensive.Sql.Drivers.SqlServer.v09;
 using Xtensive.Sql.Model;
 using Model1 = Xtensive.Orm.Tests.Issues.IssueJira0537_DropDefaultConstraintBugTestModel1;
 using Model2 = Xtensive.Orm.Tests.Issues.IssueJira0537_DropDefaultConstraintBugTestModel2;
@@ -34,10 +29,10 @@ public class Area : Entity
 
     [Field(Nullable = false)]
     public bool BoolField { get; set; }
-    
+
     [Field(Nullable = false)]
     public char CharField { get; set; }
-    
+
     [Field(Nullable = false)]
     public sbyte SbyteField { get; set; }
 
@@ -193,7 +188,7 @@ public class Area : Entity
 
       [Field]
       public uint UIntField { get; set; }
-      
+
       [Field]
       public long LongField { get; set; }
 
@@ -406,7 +401,7 @@ select driver.Compile(SqlDdl.Alter(foreignKeyInfo.Table, SqlDdl.DropConstraint(f
 
     private void InitializeConnectionStrings()
     {
-      
+
       connectionInfo = TestConfiguration.Instance.GetConnectionInfo(TestConfiguration.Instance.Storage);
 
       var connectionUrl = connectionInfo.ConnectionUrl;
diff --git a/Orm/Xtensive.Orm.Tests/Issues/Issue_0841_HintGeneratorBug3/Upgrader.cs b/Orm/Xtensive.Orm.Tests/Issues/Issue_0841_HintGeneratorBug3/Upgrader.cs
@@ -1,15 +1,14 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Ivan Galkin
 // Created:    2009.05.20
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using Xtensive.Core;
-using Xtensive.Modelling.Comparison.Hints;
 using Xtensive.Orm.Services;
 using Xtensive.Orm.Upgrade;
 using Xtensive.Sql.Drivers.SqlServer;
diff --git a/Orm/Xtensive.Orm.Tests/Storage/NestedTransactionsTest.cs b/Orm/Xtensive.Orm.Tests/Storage/NestedTransactionsTest.cs
@@ -229,7 +229,7 @@ public void CommitNestedTransactionWithActiveEnumeratorAndCommitOutermostTest()
       outerTx.Complete();
       if (storageProviderInfo.CheckProviderIs(StorageProvider.SqlServer)) {
         var exception = Assert.Throws<StorageException>(() => outerTx.Dispose());
-        Assert.That(exception.InnerException, Is.InstanceOf<System.Data.SqlClient.SqlException>());
+        Assert.That(exception.InnerException, Is.InstanceOf<Microsoft.Data.SqlClient.SqlException>());
       }
       else {
         Assert.DoesNotThrow(() => outerTx.Dispose());
diff --git a/Orm/Xtensive.Orm.Tests/Storage/Performance/SqlClientCrudTest.cs b/Orm/Xtensive.Orm.Tests/Storage/Performance/SqlClientCrudTest.cs
@@ -1,13 +1,12 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2008-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Elena Vakhtina
-// Created:    2008.19.09
+// Created:    2008.09.19
 
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using NUnit.Framework;
-using Xtensive.Orm.Tests;
 using Xtensive.Orm.Configuration;
 using Xtensive.Orm.Tests.Storage.Performance.SqlClientCrudModel;
 
diff --git a/Orm/Xtensive.Orm/Sql/ValueTypeMapping/TypeMapper.cs b/Orm/Xtensive.Orm/Sql/ValueTypeMapping/TypeMapper.cs
@@ -1,13 +1,12 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
 // Created:    2009.06.19
 
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization.Formatters.Binary;
