Skip to content

Changed System.Data.SqlClient for Microsoft.Data.SqlClient package #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/unQuery.PerformanceTests/ExecuteTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.PerformanceTests/GetRowTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.PerformanceTests/GetRowsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.PerformanceTests/GetScalarTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;
using System.Data;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery.PerformanceTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.PerformanceTests/TestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion src/unQuery.PerformanceTests/packages.config
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
20 changes: 17 additions & 3 deletions src/unQuery.PerformanceTests/unQuery.PerformanceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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" />
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/AddParametersToCommandTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/BatchExecutionerTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;
using System;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.Transactions;

namespace unQuery.Tests
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/ExecuteTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/GetOpenConnectionTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;
using System.Data;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery.Tests
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/GetScalarTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using NUnit.Framework;
using System;
using System.Data;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery.Tests
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/QueryOptionsTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using NUnit.Framework;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery.Tests
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/SqlTypes/SqlStructuredTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;
using NUnit.Framework;
using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery.Tests/TestHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;
using System.Data;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery.Tests
{
Expand Down
5 changes: 4 additions & 1 deletion src/unQuery.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
20 changes: 17 additions & 3 deletions src/unQuery.Tests/unQuery.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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" />
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/BatchExecutor.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/DB.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;

namespace unQuery
{
Expand Down
6 changes: 3 additions & 3 deletions src/unQuery/PublicSqlCommandSet.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using System.Reflection;

namespace unQuery
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/unQuery/SqlTypes/ExplicitMaxLengthType.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/unQuery/SqlTypes/ExplicitPrecisionAndScaleType.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/unQuery/SqlTypes/ExplicitScaleType.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/unQuery/SqlTypes/ExplicitValueType.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/unQuery/SqlTypes/ImplicitValueType.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlBigInt.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlBinary.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;
using System.Data;

namespace unQuery.SqlTypes
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlBit.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlChar.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlDate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlDateTime.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlDateTime2.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlDateTimeOffset.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlDecimal.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
2 changes: 1 addition & 1 deletion src/unQuery/SqlTypes/SqlFloat.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Microsoft.SqlServer.Server;
using Microsoft.Data.SqlClient.Server;

namespace unQuery.SqlTypes
{
Expand Down
Loading