From 81344b7a36f9a8ea68bdc1b138008d967bcfb229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Lund=20J=C3=B8rgensen?= <clj@ipaper.io>
Date: Wed, 13 Nov 2019 14:33:01 +0100
Subject: [PATCH] Changed System.Data.SqlClient for Microsoft.Data.SqlClient
 package

---
 src/unQuery.PerformanceTests/ExecuteTests.cs  |  2 +-
 src/unQuery.PerformanceTests/GetRowTests.cs   |  2 +-
 src/unQuery.PerformanceTests/GetRowsTests.cs  |  2 +-
 .../GetScalarTests.cs                         |  2 +-
 src/unQuery.PerformanceTests/TestFixture.cs   |  2 +-
 src/unQuery.PerformanceTests/packages.config  |  5 ++++-
 .../unQuery.PerformanceTests.csproj           | 20 ++++++++++++++++---
 .../AddParametersToCommandTests.cs            |  2 +-
 src/unQuery.Tests/BatchExecutionerTests.cs    |  2 +-
 src/unQuery.Tests/ExecuteTests.cs             |  2 +-
 src/unQuery.Tests/GetOpenConnectionTests.cs   |  2 +-
 src/unQuery.Tests/GetScalarTests.cs           |  2 +-
 src/unQuery.Tests/QueryOptionsTests.cs        |  2 +-
 .../SqlTypes/SqlStructuredTests.cs            |  2 +-
 src/unQuery.Tests/TestHelper.cs               |  2 +-
 src/unQuery.Tests/packages.config             |  5 ++++-
 src/unQuery.Tests/unQuery.Tests.csproj        | 20 ++++++++++++++++---
 src/unQuery/BatchExecutor.cs                  |  2 +-
 src/unQuery/DB.cs                             |  2 +-
 src/unQuery/PublicSqlCommandSet.cs            |  6 +++---
 src/unQuery/SqlTypes/ExplicitMaxLengthType.cs |  4 ++--
 .../SqlTypes/ExplicitPrecisionAndScaleType.cs |  4 ++--
 src/unQuery/SqlTypes/ExplicitScaleType.cs     |  4 ++--
 src/unQuery/SqlTypes/ExplicitValueType.cs     |  4 ++--
 src/unQuery/SqlTypes/ImplicitValueType.cs     |  4 ++--
 src/unQuery/SqlTypes/SqlBigInt.cs             |  2 +-
 src/unQuery/SqlTypes/SqlBinary.cs             |  2 +-
 src/unQuery/SqlTypes/SqlBit.cs                |  2 +-
 src/unQuery/SqlTypes/SqlChar.cs               |  2 +-
 src/unQuery/SqlTypes/SqlDate.cs               |  2 +-
 src/unQuery/SqlTypes/SqlDateTime.cs           |  2 +-
 src/unQuery/SqlTypes/SqlDateTime2.cs          |  2 +-
 src/unQuery/SqlTypes/SqlDateTimeOffset.cs     |  2 +-
 src/unQuery/SqlTypes/SqlDecimal.cs            |  2 +-
 src/unQuery/SqlTypes/SqlFloat.cs              |  2 +-
 src/unQuery/SqlTypes/SqlImage.cs              |  2 +-
 src/unQuery/SqlTypes/SqlInt.cs                |  2 +-
 src/unQuery/SqlTypes/SqlMoney.cs              |  2 +-
 src/unQuery/SqlTypes/SqlNChar.cs              |  2 +-
 src/unQuery/SqlTypes/SqlNText.cs              |  2 +-
 src/unQuery/SqlTypes/SqlNVarchar.cs           |  2 +-
 src/unQuery/SqlTypes/SqlReal.cs               |  2 +-
 src/unQuery/SqlTypes/SqlSmallDateTime.cs      |  2 +-
 src/unQuery/SqlTypes/SqlSmallInt.cs           |  2 +-
 src/unQuery/SqlTypes/SqlSmallMoney.cs         |  2 +-
 src/unQuery/SqlTypes/SqlStructured.cs         |  4 ++--
 src/unQuery/SqlTypes/SqlText.cs               |  2 +-
 src/unQuery/SqlTypes/SqlTime.cs               |  2 +-
 src/unQuery/SqlTypes/SqlTinyInt.cs            |  2 +-
 src/unQuery/SqlTypes/SqlType.cs               |  4 ++--
 src/unQuery/SqlTypes/SqlTypeHandler.cs        |  4 ++--
 src/unQuery/SqlTypes/SqlUniqueidentifier.cs   |  2 +-
 src/unQuery/SqlTypes/SqlVarBinary.cs          |  2 +-
 src/unQuery/SqlTypes/SqlVarchar.cs            |  2 +-
 src/unQuery/SqlTypes/SqlXml.cs                |  2 +-
 src/unQuery/StructuredDynamicYielder.cs       |  2 +-
 src/unQuery/unQuery.csproj                    |  2 +-
 src/unQuery/unQueryDB.cs                      |  2 +-
 58 files changed, 106 insertions(+), 72 deletions(-)

diff --git a/src/unQuery.PerformanceTests/ExecuteTests.cs b/src/unQuery.PerformanceTests/ExecuteTests.cs
index 6e6768f..da91bfd 100644
--- a/src/unQuery.PerformanceTests/ExecuteTests.cs
+++ b/src/unQuery.PerformanceTests/ExecuteTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using unQuery.SqlTypes;
 
 namespace unQuery.PerformanceTests
diff --git a/src/unQuery.PerformanceTests/GetRowTests.cs b/src/unQuery.PerformanceTests/GetRowTests.cs
index 649d2c7..3ea25b8 100644
--- a/src/unQuery.PerformanceTests/GetRowTests.cs
+++ b/src/unQuery.PerformanceTests/GetRowTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using unQuery.SqlTypes;
 
 namespace unQuery.PerformanceTests
diff --git a/src/unQuery.PerformanceTests/GetRowsTests.cs b/src/unQuery.PerformanceTests/GetRowsTests.cs
index 9de3d1c..ee1d03a 100644
--- a/src/unQuery.PerformanceTests/GetRowsTests.cs
+++ b/src/unQuery.PerformanceTests/GetRowsTests.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using unQuery.SqlTypes;
 
 namespace unQuery.PerformanceTests
diff --git a/src/unQuery.PerformanceTests/GetScalarTests.cs b/src/unQuery.PerformanceTests/GetScalarTests.cs
index ac727df..8c00c77 100644
--- a/src/unQuery.PerformanceTests/GetScalarTests.cs
+++ b/src/unQuery.PerformanceTests/GetScalarTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.PerformanceTests
 {
diff --git a/src/unQuery.PerformanceTests/TestFixture.cs b/src/unQuery.PerformanceTests/TestFixture.cs
index 18b4e3e..059e153 100644
--- a/src/unQuery.PerformanceTests/TestFixture.cs
+++ b/src/unQuery.PerformanceTests/TestFixture.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
diff --git a/src/unQuery.PerformanceTests/packages.config b/src/unQuery.PerformanceTests/packages.config
index f355f23..44147d3 100644
--- a/src/unQuery.PerformanceTests/packages.config
+++ b/src/unQuery.PerformanceTests/packages.config
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Data.SqlClient" version="1.0.19269.1" targetFramework="net472" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="1.0.19235.1" targetFramework="net472" />
+  <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net472" />
   <package id="NUnit" version="3.12.0" targetFramework="net472" />
   <package id="System.Configuration.ConfigurationManager" version="4.6.0" targetFramework="net472" />
-  <package id="System.Data.SqlClient" version="4.7.0" targetFramework="net472" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.AccessControl" version="4.6.0" targetFramework="net472" />
   <package id="System.Security.Permissions" version="4.6.0" targetFramework="net472" />
   <package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net472" />
diff --git a/src/unQuery.PerformanceTests/unQuery.PerformanceTests.csproj b/src/unQuery.PerformanceTests/unQuery.PerformanceTests.csproj
index dce8a11..a3e80bf 100644
--- a/src/unQuery.PerformanceTests/unQuery.PerformanceTests.csproj
+++ b/src/unQuery.PerformanceTests/unQuery.PerformanceTests.csproj
@@ -45,6 +45,12 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.SqlClient, Version=1.0.19269.1, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Data.SqlClient.1.0.19269.1\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
@@ -55,12 +61,17 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Data.SqlClient, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.SqlClient.4.7.0\lib\net461\System.Data.SqlClient.dll</HintPath>
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
     </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Security" />
     <Reference Include="System.Security.AccessControl, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Security.AccessControl.4.6.0\lib\net461\System.Security.AccessControl.dll</HintPath>
@@ -73,6 +84,7 @@
     </Reference>
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
@@ -107,7 +119,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/unQuery.Tests/AddParametersToCommandTests.cs b/src/unQuery.Tests/AddParametersToCommandTests.cs
index 3efea47..7747184 100644
--- a/src/unQuery.Tests/AddParametersToCommandTests.cs
+++ b/src/unQuery.Tests/AddParametersToCommandTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using unQuery.SqlTypes;
 
 namespace unQuery.Tests
diff --git a/src/unQuery.Tests/BatchExecutionerTests.cs b/src/unQuery.Tests/BatchExecutionerTests.cs
index 5d1ee7f..5f6b238 100644
--- a/src/unQuery.Tests/BatchExecutionerTests.cs
+++ b/src/unQuery.Tests/BatchExecutionerTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Transactions;
 
 namespace unQuery.Tests
diff --git a/src/unQuery.Tests/ExecuteTests.cs b/src/unQuery.Tests/ExecuteTests.cs
index 0bd88f2..64e2068 100644
--- a/src/unQuery.Tests/ExecuteTests.cs
+++ b/src/unQuery.Tests/ExecuteTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using unQuery.SqlTypes;
 
 namespace unQuery.Tests
diff --git a/src/unQuery.Tests/GetOpenConnectionTests.cs b/src/unQuery.Tests/GetOpenConnectionTests.cs
index d108fe2..5129f00 100644
--- a/src/unQuery.Tests/GetOpenConnectionTests.cs
+++ b/src/unQuery.Tests/GetOpenConnectionTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.Tests
 {
diff --git a/src/unQuery.Tests/GetScalarTests.cs b/src/unQuery.Tests/GetScalarTests.cs
index 2dc2cf3..8f52ae7 100644
--- a/src/unQuery.Tests/GetScalarTests.cs
+++ b/src/unQuery.Tests/GetScalarTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.Tests
 {
diff --git a/src/unQuery.Tests/QueryOptionsTests.cs b/src/unQuery.Tests/QueryOptionsTests.cs
index 2422cd1..0ff3bcc 100644
--- a/src/unQuery.Tests/QueryOptionsTests.cs
+++ b/src/unQuery.Tests/QueryOptionsTests.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.Tests
 {
diff --git a/src/unQuery.Tests/SqlTypes/SqlStructuredTests.cs b/src/unQuery.Tests/SqlTypes/SqlStructuredTests.cs
index 8b66b79..8f4a882 100644
--- a/src/unQuery.Tests/SqlTypes/SqlStructuredTests.cs
+++ b/src/unQuery.Tests/SqlTypes/SqlStructuredTests.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/unQuery.Tests/TestHelper.cs b/src/unQuery.Tests/TestHelper.cs
index c9d1318..f3cce77 100644
--- a/src/unQuery.Tests/TestHelper.cs
+++ b/src/unQuery.Tests/TestHelper.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.Tests
 {
diff --git a/src/unQuery.Tests/packages.config b/src/unQuery.Tests/packages.config
index f355f23..44147d3 100644
--- a/src/unQuery.Tests/packages.config
+++ b/src/unQuery.Tests/packages.config
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Data.SqlClient" version="1.0.19269.1" targetFramework="net472" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="1.0.19235.1" targetFramework="net472" />
+  <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net472" />
   <package id="NUnit" version="3.12.0" targetFramework="net472" />
   <package id="System.Configuration.ConfigurationManager" version="4.6.0" targetFramework="net472" />
-  <package id="System.Data.SqlClient" version="4.7.0" targetFramework="net472" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.AccessControl" version="4.6.0" targetFramework="net472" />
   <package id="System.Security.Permissions" version="4.6.0" targetFramework="net472" />
   <package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net472" />
diff --git a/src/unQuery.Tests/unQuery.Tests.csproj b/src/unQuery.Tests/unQuery.Tests.csproj
index a5847e2..7dad4d2 100644
--- a/src/unQuery.Tests/unQuery.Tests.csproj
+++ b/src/unQuery.Tests/unQuery.Tests.csproj
@@ -37,6 +37,12 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Data.SqlClient, Version=1.0.19269.1, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Data.SqlClient.1.0.19269.1\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
@@ -47,12 +53,17 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Data.SqlClient, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.SqlClient.4.7.0\lib\net461\System.Data.SqlClient.dll</HintPath>
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
     </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Security" />
     <Reference Include="System.Security.AccessControl, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Security.AccessControl.4.6.0\lib\net461\System.Security.AccessControl.dll</HintPath>
@@ -65,6 +76,7 @@
     </Reference>
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
@@ -140,7 +152,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/unQuery/BatchExecutor.cs b/src/unQuery/BatchExecutor.cs
index c5afabe..647e638 100644
--- a/src/unQuery/BatchExecutor.cs
+++ b/src/unQuery/BatchExecutor.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery
 {
diff --git a/src/unQuery/DB.cs b/src/unQuery/DB.cs
index a35699f..68083c4 100644
--- a/src/unQuery/DB.cs
+++ b/src/unQuery/DB.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Configuration;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery
 {
diff --git a/src/unQuery/PublicSqlCommandSet.cs b/src/unQuery/PublicSqlCommandSet.cs
index ff43a24..cfc3bfe 100644
--- a/src/unQuery/PublicSqlCommandSet.cs
+++ b/src/unQuery/PublicSqlCommandSet.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Reflection;
 
 namespace unQuery
@@ -21,8 +21,8 @@ internal class PublicSqlCommandSet : IDisposable
 		/// </summary>
 		static PublicSqlCommandSet()
 		{
-			var assembly = Assembly.Load("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
-			sqlCommandSetType = assembly.GetType("System.Data.SqlClient.SqlCommandSet");
+			var assembly = Assembly.Load("Microsoft.Data.SqlClient, Version=1.0.19269.1, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5");
+			sqlCommandSetType = assembly.GetType("Microsoft.Data.SqlClient.SqlCommandSet");
 		}
 
 		/// <summary>
diff --git a/src/unQuery/SqlTypes/ExplicitMaxLengthType.cs b/src/unQuery/SqlTypes/ExplicitMaxLengthType.cs
index b2dbb62..4e287e9 100644
--- a/src/unQuery/SqlTypes/ExplicitMaxLengthType.cs
+++ b/src/unQuery/SqlTypes/ExplicitMaxLengthType.cs
@@ -1,7 +1,7 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/ExplicitPrecisionAndScaleType.cs b/src/unQuery/SqlTypes/ExplicitPrecisionAndScaleType.cs
index 4fcb054..4812252 100644
--- a/src/unQuery/SqlTypes/ExplicitPrecisionAndScaleType.cs
+++ b/src/unQuery/SqlTypes/ExplicitPrecisionAndScaleType.cs
@@ -1,7 +1,7 @@
 using System;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/ExplicitScaleType.cs b/src/unQuery/SqlTypes/ExplicitScaleType.cs
index fddb6dc..0479a01 100644
--- a/src/unQuery/SqlTypes/ExplicitScaleType.cs
+++ b/src/unQuery/SqlTypes/ExplicitScaleType.cs
@@ -1,7 +1,7 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/ExplicitValueType.cs b/src/unQuery/SqlTypes/ExplicitValueType.cs
index 905c4a6..14dd0ac 100644
--- a/src/unQuery/SqlTypes/ExplicitValueType.cs
+++ b/src/unQuery/SqlTypes/ExplicitValueType.cs
@@ -1,7 +1,7 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/ImplicitValueType.cs b/src/unQuery/SqlTypes/ImplicitValueType.cs
index a414628..ead9115 100644
--- a/src/unQuery/SqlTypes/ImplicitValueType.cs
+++ b/src/unQuery/SqlTypes/ImplicitValueType.cs
@@ -1,7 +1,7 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlBigInt.cs b/src/unQuery/SqlTypes/SqlBigInt.cs
index bbb1a36..5b74d93 100644
--- a/src/unQuery/SqlTypes/SqlBigInt.cs
+++ b/src/unQuery/SqlTypes/SqlBigInt.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlBinary.cs b/src/unQuery/SqlTypes/SqlBinary.cs
index 3c48215..7033792 100644
--- a/src/unQuery/SqlTypes/SqlBinary.cs
+++ b/src/unQuery/SqlTypes/SqlBinary.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlBit.cs b/src/unQuery/SqlTypes/SqlBit.cs
index 5083733..1d921ec 100644
--- a/src/unQuery/SqlTypes/SqlBit.cs
+++ b/src/unQuery/SqlTypes/SqlBit.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlChar.cs b/src/unQuery/SqlTypes/SqlChar.cs
index 05eb1fe..9283947 100644
--- a/src/unQuery/SqlTypes/SqlChar.cs
+++ b/src/unQuery/SqlTypes/SqlChar.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlDate.cs b/src/unQuery/SqlTypes/SqlDate.cs
index dc9f290..93397c1 100644
--- a/src/unQuery/SqlTypes/SqlDate.cs
+++ b/src/unQuery/SqlTypes/SqlDate.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlDateTime.cs b/src/unQuery/SqlTypes/SqlDateTime.cs
index 6aea458..a413630 100644
--- a/src/unQuery/SqlTypes/SqlDateTime.cs
+++ b/src/unQuery/SqlTypes/SqlDateTime.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlDateTime2.cs b/src/unQuery/SqlTypes/SqlDateTime2.cs
index b9b7c57..e8e65d2 100644
--- a/src/unQuery/SqlTypes/SqlDateTime2.cs
+++ b/src/unQuery/SqlTypes/SqlDateTime2.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlDateTimeOffset.cs b/src/unQuery/SqlTypes/SqlDateTimeOffset.cs
index 22a4866..da29da8 100644
--- a/src/unQuery/SqlTypes/SqlDateTimeOffset.cs
+++ b/src/unQuery/SqlTypes/SqlDateTimeOffset.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlDecimal.cs b/src/unQuery/SqlTypes/SqlDecimal.cs
index 9b53254..b9c33f3 100644
--- a/src/unQuery/SqlTypes/SqlDecimal.cs
+++ b/src/unQuery/SqlTypes/SqlDecimal.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlFloat.cs b/src/unQuery/SqlTypes/SqlFloat.cs
index 05f4bd3..47f86d4 100644
--- a/src/unQuery/SqlTypes/SqlFloat.cs
+++ b/src/unQuery/SqlTypes/SqlFloat.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlImage.cs b/src/unQuery/SqlTypes/SqlImage.cs
index 3f20fcb..87e1ea4 100644
--- a/src/unQuery/SqlTypes/SqlImage.cs
+++ b/src/unQuery/SqlTypes/SqlImage.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlInt.cs b/src/unQuery/SqlTypes/SqlInt.cs
index f74cc47..9819c9c 100644
--- a/src/unQuery/SqlTypes/SqlInt.cs
+++ b/src/unQuery/SqlTypes/SqlInt.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlMoney.cs b/src/unQuery/SqlTypes/SqlMoney.cs
index 2eda60f..5d6ce6a 100644
--- a/src/unQuery/SqlTypes/SqlMoney.cs
+++ b/src/unQuery/SqlTypes/SqlMoney.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlNChar.cs b/src/unQuery/SqlTypes/SqlNChar.cs
index 3957559..66674ec 100644
--- a/src/unQuery/SqlTypes/SqlNChar.cs
+++ b/src/unQuery/SqlTypes/SqlNChar.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlNText.cs b/src/unQuery/SqlTypes/SqlNText.cs
index a71d957..3518cf6 100644
--- a/src/unQuery/SqlTypes/SqlNText.cs
+++ b/src/unQuery/SqlTypes/SqlNText.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlNVarchar.cs b/src/unQuery/SqlTypes/SqlNVarchar.cs
index 6634eb4..3a5f08d 100644
--- a/src/unQuery/SqlTypes/SqlNVarchar.cs
+++ b/src/unQuery/SqlTypes/SqlNVarchar.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlReal.cs b/src/unQuery/SqlTypes/SqlReal.cs
index b1baefb..0de3849 100644
--- a/src/unQuery/SqlTypes/SqlReal.cs
+++ b/src/unQuery/SqlTypes/SqlReal.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlSmallDateTime.cs b/src/unQuery/SqlTypes/SqlSmallDateTime.cs
index bf7c2d8..cb5b70e 100644
--- a/src/unQuery/SqlTypes/SqlSmallDateTime.cs
+++ b/src/unQuery/SqlTypes/SqlSmallDateTime.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlSmallInt.cs b/src/unQuery/SqlTypes/SqlSmallInt.cs
index 6d0a96c..f4ffd62 100644
--- a/src/unQuery/SqlTypes/SqlSmallInt.cs
+++ b/src/unQuery/SqlTypes/SqlSmallInt.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlSmallMoney.cs b/src/unQuery/SqlTypes/SqlSmallMoney.cs
index 9176437..18ca600 100644
--- a/src/unQuery/SqlTypes/SqlSmallMoney.cs
+++ b/src/unQuery/SqlTypes/SqlSmallMoney.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlStructured.cs b/src/unQuery/SqlTypes/SqlStructured.cs
index f487eb8..e0d9e30 100644
--- a/src/unQuery/SqlTypes/SqlStructured.cs
+++ b/src/unQuery/SqlTypes/SqlStructured.cs
@@ -1,8 +1,8 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlText.cs b/src/unQuery/SqlTypes/SqlText.cs
index 68e954b..6849ac8 100644
--- a/src/unQuery/SqlTypes/SqlText.cs
+++ b/src/unQuery/SqlTypes/SqlText.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlTime.cs b/src/unQuery/SqlTypes/SqlTime.cs
index 983f8a7..51fded5 100644
--- a/src/unQuery/SqlTypes/SqlTime.cs
+++ b/src/unQuery/SqlTypes/SqlTime.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlTinyInt.cs b/src/unQuery/SqlTypes/SqlTinyInt.cs
index ed0d5e6..7bc7b0f 100644
--- a/src/unQuery/SqlTypes/SqlTinyInt.cs
+++ b/src/unQuery/SqlTypes/SqlTinyInt.cs
@@ -1,5 +1,5 @@
 using System.Data;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlType.cs b/src/unQuery/SqlTypes/SqlType.cs
index f45ee55..1926fc5 100644
--- a/src/unQuery/SqlTypes/SqlType.cs
+++ b/src/unQuery/SqlTypes/SqlType.cs
@@ -1,6 +1,6 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlTypeHandler.cs b/src/unQuery/SqlTypes/SqlTypeHandler.cs
index 3e0332b..a05eb62 100644
--- a/src/unQuery/SqlTypes/SqlTypeHandler.cs
+++ b/src/unQuery/SqlTypes/SqlTypeHandler.cs
@@ -1,6 +1,6 @@
 using System;
-using Microsoft.SqlServer.Server;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient.Server;
+using Microsoft.Data.SqlClient;
 
 namespace unQuery.SqlTypes
 {
diff --git a/src/unQuery/SqlTypes/SqlUniqueidentifier.cs b/src/unQuery/SqlTypes/SqlUniqueidentifier.cs
index 734cec9..2b3d8bd 100644
--- a/src/unQuery/SqlTypes/SqlUniqueidentifier.cs
+++ b/src/unQuery/SqlTypes/SqlUniqueidentifier.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data;
 
diff --git a/src/unQuery/SqlTypes/SqlVarBinary.cs b/src/unQuery/SqlTypes/SqlVarBinary.cs
index 0dd4f7e..c4261dc 100644
--- a/src/unQuery/SqlTypes/SqlVarBinary.cs
+++ b/src/unQuery/SqlTypes/SqlVarBinary.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlVarchar.cs b/src/unQuery/SqlTypes/SqlVarchar.cs
index 3d6b3bd..d21e329 100644
--- a/src/unQuery/SqlTypes/SqlVarchar.cs
+++ b/src/unQuery/SqlTypes/SqlVarchar.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/SqlTypes/SqlXml.cs b/src/unQuery/SqlTypes/SqlXml.cs
index c6e9ea3..fab41f6 100644
--- a/src/unQuery/SqlTypes/SqlXml.cs
+++ b/src/unQuery/SqlTypes/SqlXml.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System.Data;
 
 namespace unQuery.SqlTypes
diff --git a/src/unQuery/StructuredDynamicYielder.cs b/src/unQuery/StructuredDynamicYielder.cs
index d597230..9ceb1dd 100644
--- a/src/unQuery/StructuredDynamicYielder.cs
+++ b/src/unQuery/StructuredDynamicYielder.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
diff --git a/src/unQuery/unQuery.csproj b/src/unQuery/unQuery.csproj
index 60affb8..14a4fc3 100644
--- a/src/unQuery/unQuery.csproj
+++ b/src/unQuery/unQuery.csproj
@@ -37,8 +37,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19269.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
   </ItemGroup>
 
diff --git a/src/unQuery/unQueryDB.cs b/src/unQuery/unQueryDB.cs
index 9a8758b..054621f 100644
--- a/src/unQuery/unQueryDB.cs
+++ b/src/unQuery/unQueryDB.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;