diff --git a/Directory.Build.props b/Common.props similarity index 66% rename from Directory.Build.props rename to Common.props index 51da0607..5c85c8bb 100644 --- a/Directory.Build.props +++ b/Common.props @@ -1,8 +1,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 160.1910103.0-preview - 1.0.19269.1 + 160.1910315.0-preview true true diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 9065ea2a..00000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - - \ No newline at end of file diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs index 4bbe6ae7..eeb80870 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs @@ -8,7 +8,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using System.Threading; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionUtils.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionUtils.cs index 534b2b4e..835243e3 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionUtils.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionUtils.cs @@ -5,7 +5,7 @@ using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.CoreServices.Connection.ReliableConnection; public static class ConnectionUtils diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/CachedServerInfo.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/CachedServerInfo.cs index cc45bb59..f6c47be8 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/CachedServerInfo.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/CachedServerInfo.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Concurrent; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using Microsoft.SqlTools.Hosting.Utility; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbCommandWrapper.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbCommandWrapper.cs index ffc03a9b..ef9a2fc2 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbCommandWrapper.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbCommandWrapper.cs @@ -5,7 +5,7 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.Hosting.Utility; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbConnectionWrapper.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbConnectionWrapper.cs index 9b6e2587..19352504 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbConnectionWrapper.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/DbConnectionWrapper.cs @@ -5,7 +5,7 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.Hosting.Utility; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableConnectionHelper.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableConnectionHelper.cs index 1e67ea31..ae6863ba 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableConnectionHelper.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableConnectionHelper.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlCommand.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlCommand.cs index 548a902b..f085be8e 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlCommand.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlCommand.cs @@ -26,7 +26,7 @@ using System; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics.Contracts; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlConnection.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlConnection.cs index c7b46a8f..3fd74ada 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlConnection.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/ReliableSqlConnection.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Globalization; using System.Text; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs index 68f9beb8..b60106d0 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using Microsoft.SqlTools.Hosting.Utility; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs index 018296c6..9d9b36a6 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs index 0ab2bfa1..2dec9c35 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs index 8914a34e..b4dc9d90 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs @@ -4,7 +4,7 @@ // using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs index 4e364391..5362034c 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.CoreServices.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs index de96ac14..759236ef 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using System.Text; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.cs index 26c579c0..fbaaf10d 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicy.cs @@ -24,7 +24,7 @@ // namespace Microsoft.SqlServer.Management.Common using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.Contracts; using System.Globalization; diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicyUtils.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicyUtils.cs index 3faefd42..4195ad1d 100644 --- a/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicyUtils.cs +++ b/src/Microsoft.SqlTools.CoreServices/Connection/ReliableConnection/RetryPolicyUtils.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Runtime.InteropServices; using Microsoft.SqlTools.Hosting.Utility; diff --git a/src/Microsoft.SqlTools.CoreServices/LanguageServices/ConnectedBindingQueue.cs b/src/Microsoft.SqlTools.CoreServices/LanguageServices/ConnectedBindingQueue.cs index 9e0ad0c7..cbeb9031 100644 --- a/src/Microsoft.SqlTools.CoreServices/LanguageServices/ConnectedBindingQueue.cs +++ b/src/Microsoft.SqlTools.CoreServices/LanguageServices/ConnectedBindingQueue.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.SmoMetadataProvider; using Microsoft.SqlServer.Management.SqlParser.Binder; diff --git a/src/Microsoft.SqlTools.CoreServices/Microsoft.SqlTools.CoreServices.csproj b/src/Microsoft.SqlTools.CoreServices/Microsoft.SqlTools.CoreServices.csproj index 92605c7c..2b77dafc 100644 --- a/src/Microsoft.SqlTools.CoreServices/Microsoft.SqlTools.CoreServices.csproj +++ b/src/Microsoft.SqlTools.CoreServices/Microsoft.SqlTools.CoreServices.csproj @@ -1,4 +1,5 @@  + Library netstandard2.0 @@ -14,6 +15,8 @@ $(PackageDescription) + + @@ -27,4 +30,5 @@ + diff --git a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj index 2d341ac5..99d55c87 100644 --- a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj +++ b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj @@ -1,4 +1,5 @@ + netcoreapp2.2 MicrosoftSqlToolsCredentials @@ -15,6 +16,11 @@ win7-x64;win7-x86;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64;linux-x64 + + + + + diff --git a/src/Microsoft.SqlTools.DataProtocol.Contracts/Microsoft.SqlTools.DataProtocol.Contracts.csproj b/src/Microsoft.SqlTools.DataProtocol.Contracts/Microsoft.SqlTools.DataProtocol.Contracts.csproj index 9c75fb4c..af269551 100644 --- a/src/Microsoft.SqlTools.DataProtocol.Contracts/Microsoft.SqlTools.DataProtocol.Contracts.csproj +++ b/src/Microsoft.SqlTools.DataProtocol.Contracts/Microsoft.SqlTools.DataProtocol.Contracts.csproj @@ -12,4 +12,5 @@ + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.Hosting.Contracts/Microsoft.SqlTools.Hosting.Contracts.csproj b/src/Microsoft.SqlTools.Hosting.Contracts/Microsoft.SqlTools.Hosting.Contracts.csproj index 11eda7cf..f2a43107 100644 --- a/src/Microsoft.SqlTools.Hosting.Contracts/Microsoft.SqlTools.Hosting.Contracts.csproj +++ b/src/Microsoft.SqlTools.Hosting.Contracts/Microsoft.SqlTools.Hosting.Contracts.csproj @@ -6,4 +6,5 @@ $(PackageDescription) + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.Hosting.v2/Microsoft.SqlTools.Hosting.v2.csproj b/src/Microsoft.SqlTools.Hosting.v2/Microsoft.SqlTools.Hosting.v2.csproj index ddd9febb..3d983d5d 100644 --- a/src/Microsoft.SqlTools.Hosting.v2/Microsoft.SqlTools.Hosting.v2.csproj +++ b/src/Microsoft.SqlTools.Hosting.v2/Microsoft.SqlTools.Hosting.v2.csproj @@ -31,4 +31,5 @@ + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.Hosting/packages.config b/src/Microsoft.SqlTools.Hosting/packages.config new file mode 100644 index 00000000..a0dd32a2 --- /dev/null +++ b/src/Microsoft.SqlTools.Hosting/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs index 2321becf..a2d6a410 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs @@ -5,7 +5,7 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs index 9925ee15..5bff029e 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs index 0a8b6443..ef1cddd3 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs index 53403111..33b90cad 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using Microsoft.SqlTools.ManagedBatchParser; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs index 99d5c8cc..c4cdcd45 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs index 340017af..5fabed81 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj index 52b46318..a28e0c10 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj @@ -1,4 +1,5 @@  + netstandard2.0 false @@ -8,6 +9,10 @@ + + + + diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs index 241ed73c..87ca38d1 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Concurrent; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using Microsoft.SqlServer.Management.Common; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs index c4736fd8..86413030 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs @@ -5,7 +5,7 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs index 18568915..dcd38936 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs @@ -5,7 +5,7 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs index 31f253bb..8db0ff9f 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs index 278ad0ec..7f55040a 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs @@ -26,7 +26,7 @@ using System; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs index c092a881..3b9750a0 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Globalization; using System.Text; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs index 1b095e8a..e0678921 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using Microsoft.SqlTools.Utility; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs index 00369962..de7f4b5d 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs index c300d94a..5b2b0d7c 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs index 5e8b0d4c..cefa6b4e 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs @@ -4,7 +4,7 @@ // using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs index fea01bb9..4446b0c8 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs index 21152e24..4df38944 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using System.Text; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs index 4dbc9633..6bb5d3c5 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs @@ -24,7 +24,7 @@ // namespace Microsoft.SqlServer.Management.Common using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.Contracts; using System.Globalization; diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs index 74fcefd1..59423c01 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Runtime.InteropServices; using Microsoft.SqlTools.Utility; diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs index 7bb250d7..2a5207df 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs +++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs @@ -4,7 +4,7 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; namespace Microsoft.SqlTools.ResourceProvider.Core diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Firewall/FirewallErrorParser.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Firewall/FirewallErrorParser.cs index de49255e..cd2dfda1 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Firewall/FirewallErrorParser.cs +++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Firewall/FirewallErrorParser.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Net; using System.Text.RegularExpressions; diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj b/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj index 1f74addd..e369842e 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj +++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj @@ -11,6 +11,7 @@ � Microsoft Corporation. All rights reserved. + diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj index ed39cf24..0b95bccc 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj +++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj b/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj index 52d0d528..7a148110 100644 --- a/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj +++ b/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj @@ -1,4 +1,5 @@ + netcoreapp2.2 SqlToolsResourceProviderService diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs index 2140b223..d2118c2f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs @@ -14,7 +14,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin { public static class AzureSqlDbHelper { - /// /// Registry sub key for the AzureServiceObjectives overrides /// diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs index 9fe2ed74..2c3f5a35 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs @@ -17,7 +17,7 @@ using Smo = Microsoft.SqlServer.Management.Smo; using Microsoft.SqlServer.Management.Sdk.Sfc; using Microsoft.SqlServer.Management.Diagnostics; using System.Globalization; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Collections.Generic; using AzureEdition = Microsoft.SqlTools.ServiceLayer.Admin.AzureSqlDbHelper.AzureEdition; using Microsoft.SqlTools.ServiceLayer.Management; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs index ffec8701..539b81db 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs @@ -13,7 +13,7 @@ using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlServer.Management.Sdk.Sfc; using Microsoft.SqlServer.Management.Diagnostics; using System.Globalization; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Collections.Generic; using System.Diagnostics; using AzureEdition = Microsoft.SqlTools.ServiceLayer.Admin.AzureSqlDbHelper.AzureEdition; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs index 4fa02330..b11fe25e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.ComponentModel; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using Microsoft.SqlServer.Management.Common; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs index 398995cb..24923f30 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.IO; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Reflection; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.Agent.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs index b78d6a15..57a19970 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Sdk.Sfc; using Microsoft.SqlServer.Management.Smo.Agent; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs index affd6334..596ff695 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs @@ -8,7 +8,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using System.Threading; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs index 9f81f541..a12d2e29 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Threading; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxService.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxService.cs index 80e5cdbc..e4b74ba0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxService.cs @@ -9,7 +9,7 @@ using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.TaskServices; using System; using System.Collections.Concurrent; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.SqlTools.ServiceLayer.DacFx diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DeployOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DeployOperation.cs index c5408da9..50672b0a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DeployOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DeployOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; namespace Microsoft.SqlTools.ServiceLayer.DacFx diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs index 5ac135c1..15cb1bf1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; namespace Microsoft.SqlTools.ServiceLayer.DacFx diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs index 57d58748..958bb5c9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Globalization; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs index 62326d53..e72bf8d9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; namespace Microsoft.SqlTools.ServiceLayer.DacFx diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs index b6f79c64..e1fe7f6e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.IO; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs index 08c69b6e..df277f36 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts; using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; namespace Microsoft.SqlTools.ServiceLayer.DacFx diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs index 46359b6f..8b689c8a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs @@ -7,7 +7,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Sdk.Sfc; using Microsoft.SqlServer.Management.Smo; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs index 20c19fe0..eff0520e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs @@ -7,7 +7,7 @@ using Microsoft.SqlTools.ServiceLayer.Admin; using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts; using Microsoft.SqlTools.ServiceLayer.Management; using Microsoft.SqlTools.ServiceLayer.TaskServices; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery { diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryFileValidator.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryFileValidator.cs index 4c5d660c..25b5eb42 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryFileValidator.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryFileValidator.cs @@ -6,7 +6,7 @@ using System; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using Microsoft.SqlServer.Management.Sdk.Sfc; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs index 7fa19314..6d01e4be 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting.Protocol; diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs index 7dfc55e4..6646f203 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs @@ -6,7 +6,7 @@ using System; using System.Linq; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlTools.ServiceLayer.Connection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/SmoEditMetadataFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/SmoEditMetadataFactory.cs index 510d1fc6..8f56c737 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/SmoEditMetadataFactory.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/SmoEditMetadataFactory.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlTools.ServiceLayer.Connection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowCreate.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowCreate.cs index fd244929..7fc9eac2 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowCreate.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowCreate.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowEditBase.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowEditBase.cs index 8efdaf91..305ac596 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowEditBase.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowEditBase.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.EditData.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowUpdate.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowUpdate.cs index c18e9afc..073e574b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowUpdate.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowUpdate.cs @@ -8,7 +8,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Linq; using System.Text; diff --git a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs index dd4be99f..62a51129 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs @@ -10,7 +10,7 @@ using System.Globalization; using System.Linq; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Sdk.Sfc; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.FileBrowser { diff --git a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs index 9d2420b6..ceea6709 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Concurrent; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting.Protocol; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs index 480b9cf8..79c96901 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using System.Net.Sockets; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs index 73f0801f..29cdf503 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.SmoMetadataProvider; using Microsoft.SqlServer.Management.SqlParser.Binder; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs index 31862d2b..a64db0b3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs @@ -5,7 +5,7 @@ using System; using System.Collections; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using System.Reflection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Metadata/MetadataService.cs b/src/Microsoft.SqlTools.ServiceLayer/Metadata/MetadataService.cs index c28de08e..bc65462c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Metadata/MetadataService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Metadata/MetadataService.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Metadata/SmoMetadataFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Metadata/SmoMetadataFactory.cs index 6b816d5e..2793ecb3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Metadata/SmoMetadataFactory.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Metadata/SmoMetadataFactory.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlTools.ServiceLayer.Connection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj index 45b6f51c..04451825 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj +++ b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 MicrosoftSqlToolsServiceLayer @@ -20,6 +21,8 @@ + + diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs index 9207cdfe..2e135aad 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs @@ -5,7 +5,7 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Globalization; using System.Linq; diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs index a0d34910..a0d3a90a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Smo; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs index 4fd5a6d3..b47a1a50 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Xml; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs index dc659fbc..9bb36ec9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Specialized; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using System.Text; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs index 49a411b0..15e11de5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using System.Threading; diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs index 5181f00b..adcd69e6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Diagnostics; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs index 68742616..5a82cb5a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs @@ -5,7 +5,7 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Data.SqlTypes; using System.Diagnostics; using System.IO; diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs index ed7dbb12..9e552a3a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs @@ -5,7 +5,7 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsScriptingOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsScriptingOperation.cs index 398ebeb1..7a6a8c86 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsScriptingOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsScriptingOperation.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts; using Microsoft.SqlTools.Utility; @@ -26,7 +26,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Scripting /// public class ScriptAsScriptingOperation : SmoScriptingOperation { - private static readonly Dictionary scriptCompatibilityMap = LoadScriptCompatibilityMap(); + private static Dictionary scriptCompatabilityMap = LoadScriptCompatabilityMap(); /// /// Left delimiter for an named object /// @@ -548,7 +548,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Scripting } } - private static Dictionary LoadScriptCompatibilityMap() + private static Dictionary LoadScriptCompatabilityMap() { return new Dictionary { @@ -561,7 +561,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Scripting {SqlScriptOptions.ScriptCompatibilityOptions.Script100Compat.ToString(), SqlServerVersion.Version100}, {SqlScriptOptions.ScriptCompatibilityOptions.Script90Compat.ToString(), SqlServerVersion.Version90} }; - } private void SetScriptingOptions(ScriptingOptions scriptingOptions) @@ -574,7 +573,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Scripting //We always want role memberships for users and database roles to be scripted scriptingOptions.IncludeDatabaseRoleMemberships = true; SqlServerVersion targetServerVersion; - if(scriptCompatibilityMap.TryGetValue(this.Parameters.ScriptOptions.ScriptCompatibilityOption, out targetServerVersion)) + if(scriptCompatabilityMap.TryGetValue(this.Parameters.ScriptOptions.ScriptCompatibilityOption, out targetServerVersion)) { scriptingOptions.TargetServerVersion = targetServerVersion; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs index fd315148..f2f58938 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Linq; using System.Reflection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingScriptOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingScriptOperation.cs index dc13f0f2..d7efdac8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingScriptOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingScriptOperation.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using Microsoft.SqlServer.Management.SqlScriptPublish; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/SmoScriptingOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/SmoScriptingOperation.cs index 9391d249..fee5395d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/SmoScriptingOperation.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/SmoScriptingOperation.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts; using Microsoft.SqlTools.Utility; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.IO; using System.Reflection; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs index ed0805a1..350f0955 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Security; using System.Text; using Microsoft.SqlServer.Management.Common; diff --git a/src/Directory.Build.targets b/src/sqltools.common.targets similarity index 100% rename from src/Directory.Build.targets rename to src/sqltools.common.targets diff --git a/test/Directory.Build.props b/test/Directory.Build.props deleted file mode 100644 index 9065ea2a..00000000 --- a/test/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - - \ No newline at end of file diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs index 3be6604e..5b30ddb6 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserTests.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserTests.cs index 23613825..88675877 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserTests.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserTests.cs @@ -10,7 +10,7 @@ using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using System.Text; diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj index 5ea6d8fd..3be3d925 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 false @@ -32,6 +33,8 @@ + + diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/BatchEventHandler.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/BatchEventHandler.cs index 7921333f..29b57b7a 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/BatchEventHandler.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/BatchEventHandler.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/ExecutionEngineTest.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/ExecutionEngineTest.cs index 11e3618c..22204bde 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/ExecutionEngineTest.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/ExecutionEngineTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading; using System.Threading.Tasks; using Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.Utility; diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs index 63f40769..c7251d4c 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; using Microsoft.SqlTools.Utility; diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Utility/LiveConnectionHelper.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Utility/LiveConnectionHelper.cs index a83beea8..c673dba6 100644 --- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Utility/LiveConnectionHelper.cs +++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Utility/LiveConnectionHelper.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Reflection; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs index 615dc71d..dadf43c9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs @@ -78,7 +78,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Cms RegisteredServerName = name, RegisteredServerDescription = "My Registered Test Server", ParentOwnerUri = connectParams.OwnerUri, - RegisteredServerConnectionDetails = new ConnectionDetails { ServerName = name}, RelativePath = "RegisteredServersStore/ServerGroup[@Name='DatabaseEngineServerGroup']" //Top level }; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Connection/ReliableConnectionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Connection/ReliableConnectionTests.cs index fe52711e..18a180fa 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Connection/ReliableConnectionTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Connection/ReliableConnectionTests.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs index e7abed8c..e354938d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Threading.Tasks; using Microsoft.SqlServer.Management.Smo; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/DisasterRecoveryFileValidatorTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/DisasterRecoveryFileValidatorTests.cs index 9790426e..68160a87 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/DisasterRecoveryFileValidatorTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/DisasterRecoveryFileValidatorTests.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using Microsoft.SqlTools.ServiceLayer.Admin; using Microsoft.SqlTools.ServiceLayer.Connection; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/RestoreDatabaseServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/RestoreDatabaseServiceTests.cs index 2564bf8e..94f8057d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/RestoreDatabaseServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/RestoreDatabaseServiceTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using System.Linq; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Metadata/MetadataServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Metadata/MetadataServiceTests.cs index 37b57239..14c2a469 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Metadata/MetadataServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Metadata/MetadataServiceTests.cs @@ -13,7 +13,7 @@ using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Moq; using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj index de0b71e3..0406a472 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 false @@ -33,6 +34,8 @@ + + diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs index 7437acba..a52650c9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Threading; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs index 86c982ca..961c3d89 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs @@ -12,7 +12,7 @@ using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Utility; using Moq; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.IO; using System.Linq; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TaskServices/TaskServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TaskServices/TaskServiceTests.cs index 13580dec..82fc60eb 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TaskServices/TaskServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TaskServices/TaskServiceTests.cs @@ -4,7 +4,7 @@ // using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; using Microsoft.SqlServer.Management.Common; diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs index d5764e85..6d2e841b 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.IO; using System.Reflection; diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj index 718fe19b..c50b11f9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 false @@ -11,6 +12,8 @@ + + diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs index c43c993b..40d0cc53 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs @@ -8,7 +8,7 @@ using System.Globalization; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Xunit; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading.Tasks; using Microsoft.SqlServer.Management.Common; diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj index bc89b3a4..41232642 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 false @@ -11,6 +12,8 @@ + + diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/CachedServerInfoTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/CachedServerInfoTests.cs index cf100c92..fbbed1da 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/CachedServerInfoTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/CachedServerInfoTests.cs @@ -5,7 +5,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; using Xunit; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using Microsoft.SqlServer.Management.Common; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Connection diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs index 87808943..124d8fde 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Reflection; using System.Threading; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs index 3b984dcb..d681f555 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs @@ -10,7 +10,7 @@ using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts; using Microsoft.SqlTools.ServiceLayer.Management; using Microsoft.SqlTools.ServiceLayer.TaskServices; using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Threading; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.DisasterRecovery diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj index bc116714..c9aa721f 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj @@ -1,4 +1,5 @@  + Exe netcoreapp2.2 @@ -13,7 +14,9 @@ + + diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs index 48ae58e7..fd9487aa 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting.Protocol; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs index d382eb79..8f139844 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Globalization; using System.Threading; using Microsoft.SqlServer.Management.Common; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs index 3dbb3776..ff749d1f 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs index 3a517d37..2bd80fc0 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs index ceba7352..2c89f579 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Diagnostics; using System.Linq; using Microsoft.SqlTools.ResourceProvider.Core; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs index 660cd25f..3b02434d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs @@ -8,7 +8,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data.Common; -using Microsoft.Data.SqlClient; +using System.Data.SqlClient; using System.Linq; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility diff --git a/test/Microsoft.SqlTools.Test.CompletionExtension/Microsoft.SqlTools.Test.CompletionExtension.csproj b/test/Microsoft.SqlTools.Test.CompletionExtension/Microsoft.SqlTools.Test.CompletionExtension.csproj index e6757583..c10fc10e 100644 --- a/test/Microsoft.SqlTools.Test.CompletionExtension/Microsoft.SqlTools.Test.CompletionExtension.csproj +++ b/test/Microsoft.SqlTools.Test.CompletionExtension/Microsoft.SqlTools.Test.CompletionExtension.csproj @@ -1,4 +1,5 @@  + netcoreapp2.2 false