diff --git a/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriver.cs b/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriver.cs index b09463ce..929ade64 100644 --- a/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriver.cs +++ b/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriver.cs @@ -9,9 +9,9 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; diff --git a/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriverBase.cs b/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriverBase.cs index d0b5e68f..3e9a7dc0 100644 --- a/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriverBase.cs +++ b/docs/samples/jsonrpc/netcore/executequery/Driver/ClientDriverBase.cs @@ -7,10 +7,10 @@ using System; using System.Collections.Concurrent; using System.Diagnostics; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.JsonRpc.Driver { diff --git a/docs/samples/jsonrpc/netcore/executequery/Utility/ClientHelper.cs b/docs/samples/jsonrpc/netcore/executequery/Utility/ClientHelper.cs index 28f5f2f5..54f81c68 100644 --- a/docs/samples/jsonrpc/netcore/executequery/Utility/ClientHelper.cs +++ b/docs/samples/jsonrpc/netcore/executequery/Utility/ClientHelper.cs @@ -7,8 +7,8 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.SqlTools.JsonRpc.Driver; +using Microsoft.SqlTools.Credentials.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Contracts/Credential.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Contracts/Credential.cs index d8c3d973..b34d9453 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Contracts/Credential.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Contracts/Credential.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Contracts +namespace Microsoft.SqlTools.Credentials.Contracts { /// /// A Credential containing information needed to log into a resource. This is primarily diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/CredentialService.cs b/src/Microsoft.SqlTools.Credentials/Credentials/CredentialService.cs index 0054ec05..8e55d431 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/CredentialService.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/CredentialService.cs @@ -6,14 +6,14 @@ using System; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Credentials.Linux; -using Microsoft.SqlTools.ServiceLayer.Credentials.OSX; -using Microsoft.SqlTools.ServiceLayer.Credentials.Win32; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Credentials.Linux; +using Microsoft.SqlTools.Credentials.OSX; +using Microsoft.SqlTools.Credentials.Win32; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { /// /// Service responsible for securing credentials in a platform-neutral manner. This provides diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/ICredentialStore.cs b/src/Microsoft.SqlTools.Credentials/Credentials/ICredentialStore.cs index 0fa51cdd..1554958a 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/ICredentialStore.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/ICredentialStore.cs @@ -3,9 +3,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; +using Microsoft.SqlTools.Credentials.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { /// /// An support securely saving and retrieving passwords diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/InteropUtils.cs b/src/Microsoft.SqlTools.Credentials/Credentials/InteropUtils.cs index fdb5343e..684070bc 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/InteropUtils.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/InteropUtils.cs @@ -7,7 +7,7 @@ using System; using System.Runtime.InteropServices; using System.Text; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { internal static class InteropUtils { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/CredentialsWrapper.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/CredentialsWrapper.cs index 3deab819..0bad313d 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/CredentialsWrapper.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/CredentialsWrapper.cs @@ -4,9 +4,9 @@ // using System.Collections.Generic; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; +using Microsoft.SqlTools.Credentials.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux +namespace Microsoft.SqlTools.Credentials.Linux { /// /// Simplified class to enable writing a set of credentials to/from disk diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/FileTokenStorage.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/FileTokenStorage.cs index 94bbde62..c276b3ca 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/FileTokenStorage.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/FileTokenStorage.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Utility; using Newtonsoft.Json; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux +namespace Microsoft.SqlTools.Credentials.Linux { #if !WINDOWS_ONLY_BUILD diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Errors.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Errors.cs index d5668068..9e2029d4 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Errors.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Errors.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { #if !WINDOWS_ONLY_BUILD diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Sys.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Sys.cs index 95848568..3f7a39b5 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Sys.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Sys.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { #if !WINDOWS_ONLY_BUILD diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/LinuxCredentialStore.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/LinuxCredentialStore.cs index 1009b401..9f5230ed 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Linux/LinuxCredentialStore.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Linux/LinuxCredentialStore.cs @@ -9,10 +9,10 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux +namespace Microsoft.SqlTools.Credentials.Linux { /// /// Store configuration struct diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.CoreFoundation.cs b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.CoreFoundation.cs index 140dfc63..8c71ee46 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.CoreFoundation.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.CoreFoundation.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { internal static partial class Interop { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Libraries.cs b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Libraries.cs index 7ad5b639..9dffc473 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Libraries.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Libraries.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { internal static partial class Interop { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Security.cs b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Security.cs index ffc0b4a8..f7afc98b 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Security.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Security.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { internal partial class Interop { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/OSXCredentialStore.cs b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/OSXCredentialStore.cs index ff76fd00..a2b638c3 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/OSXCredentialStore.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/OSXCredentialStore.cs @@ -5,10 +5,10 @@ using System; using System.Runtime.InteropServices; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.OSX +namespace Microsoft.SqlTools.Credentials.OSX { #if !WINDOWS_ONLY_BUILD diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/SafeCreateHandle.OSX.cs b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/SafeCreateHandle.OSX.cs index 5beaaf26..2a9704f0 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/OSX/SafeCreateHandle.OSX.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/OSX/SafeCreateHandle.OSX.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.SqlTools.ServiceLayer.Credentials +namespace Microsoft.SqlTools.Credentials { /// diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/SecureStringHelper.cs b/src/Microsoft.SqlTools.Credentials/Credentials/SecureStringHelper.cs index 070e0b20..16dec119 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/SecureStringHelper.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/SecureStringHelper.cs @@ -7,7 +7,7 @@ using System; using System.Runtime.InteropServices; using System.Security; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials { internal static class SecureStringHelper { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialSet.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialSet.cs index 54629b24..15f6e77c 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialSet.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialSet.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { public class CredentialSet: List, IDisposable { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialType.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialType.cs index edc16d0d..b06bf890 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialType.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialType.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License 2.0 // -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { public enum CredentialType: uint { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/NativeMethods.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/NativeMethods.cs index a75f7615..20b0ed2f 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/NativeMethods.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/NativeMethods.cs @@ -6,9 +6,8 @@ using System; using System.Runtime.InteropServices; using System.Text; -using Microsoft.SqlTools.Credentials; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { internal class NativeMethods { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/PersistanceType.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/PersistanceType.cs index b08eff08..3c939fe6 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/PersistanceType.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/PersistanceType.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License 2.0 // -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { public enum PersistanceType : uint { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32Credential.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32Credential.cs index fc2f13f2..42b02555 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32Credential.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32Credential.cs @@ -7,9 +7,8 @@ using System; using System.Runtime.InteropServices; using System.Security; using System.Text; -using Microsoft.SqlTools.Credentials; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { public class Win32Credential: IDisposable { diff --git a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32CredentialStore.cs b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32CredentialStore.cs index dffb23a7..e6e8aee6 100644 --- a/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32CredentialStore.cs +++ b/src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32CredentialStore.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32 +namespace Microsoft.SqlTools.Credentials.Win32 { /// /// Win32 implementation of the credential store diff --git a/src/Microsoft.SqlTools.Credentials/CredentialsServiceHost.cs b/src/Microsoft.SqlTools.Credentials/CredentialsServiceHost.cs new file mode 100644 index 00000000..9ec96b31 --- /dev/null +++ b/src/Microsoft.SqlTools.Credentials/CredentialsServiceHost.cs @@ -0,0 +1,175 @@ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting; +using Microsoft.SqlTools.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Utility; + +namespace Microsoft.SqlTools.Credentials +{ + /// + /// SQL Tools Credentials Service request handler. Provides the entire JSON RPC + /// implementation for sending/receiving JSON requests and dispatching the requests to + /// handlers that are registered prior to startup. + /// + public sealed class CredentialsServiceHost : ServiceHostBase + { + /// + /// This timeout limits the amount of time that shutdown tasks can take to complete + /// prior to the process shutting down. + /// + private const int ShutdownTimeoutInSeconds = 120; + + #region Singleton Instance Code + + /// + /// Singleton instance of the service host for internal storage + /// + private static readonly Lazy instance = new Lazy(() => new CredentialsServiceHost()); + + /// + /// Current instance of the ServiceHost + /// + public static CredentialsServiceHost Instance + { + get { return instance.Value; } + } + + /// + /// Constructs new instance of ServiceHost using the host and profile details provided. + /// Access is private to ensure only one instance exists at a time. + /// + private CredentialsServiceHost() : base(new StdioServerChannel()) + { + // Initialize the shutdown activities + shutdownCallbacks = new List(); + initializeCallbacks = new List(); + } + + /// + /// Provide initialization that must occur after the service host is started + /// + public void InitializeRequestHandlers() + { + // Register the requests that this service host will handle + this.SetRequestHandler(InitializeRequest.Type, this.HandleInitializeRequest); + this.SetRequestHandler(ShutdownRequest.Type, this.HandleShutdownRequest); + this.SetRequestHandler(VersionRequest.Type, HandleVersionRequest); + } + + #endregion + + #region Member Variables + + /// + /// Delegate definition for the host shutdown event + /// + /// + /// + public delegate Task ShutdownCallback(object shutdownParams, RequestContext shutdownRequestContext); + + /// + /// Delegate definition for the host initialization event + /// + /// + /// + public delegate Task InitializeCallback(InitializeRequest startupParams, RequestContext requestContext); + + private readonly List shutdownCallbacks; + + private readonly List initializeCallbacks; + + private static readonly Version serviceVersion = Assembly.GetEntryAssembly().GetName().Version; + + #endregion + + #region Public Methods + + /// + /// Adds a new callback to be called when the shutdown request is submitted + /// + /// Callback to perform when a shutdown request is submitted + public void RegisterShutdownTask(ShutdownCallback callback) + { + shutdownCallbacks.Add(callback); + } + + /// + /// Add a new method to be called when the initialize request is submitted + /// + /// Callback to perform when an initialize request is submitted + public void RegisterInitializeTask(InitializeCallback callback) + { + initializeCallbacks.Add(callback); + } + + #endregion + + #region Request Handlers + + /// + /// Handles the shutdown event for the Language Server + /// + private async Task HandleShutdownRequest(object shutdownParams, RequestContext requestContext) + { + Logger.Write(LogLevel.Normal, "Service host is shutting down..."); + + // Call all the shutdown methods provided by the service components + Task[] shutdownTasks = shutdownCallbacks.Select(t => t(shutdownParams, requestContext)).ToArray(); + TimeSpan shutdownTimeout = TimeSpan.FromSeconds(ShutdownTimeoutInSeconds); + // shut down once all tasks are completed, or after the timeout expires, whichever comes first. + await Task.WhenAny(Task.WhenAll(shutdownTasks), Task.Delay(shutdownTimeout)).ContinueWith(t => Environment.Exit(0)); + } + + /// + /// Handles the initialization request + /// + /// + /// + /// + internal async Task HandleInitializeRequest(InitializeRequest initializeParams, RequestContext requestContext) + { + // Call all tasks that registered on the initialize request + var initializeTasks = initializeCallbacks.Select(t => t(initializeParams, requestContext)); + await Task.WhenAll(initializeTasks); + + // TODO: Figure out where this needs to go to be agnostic of the language + + // Send back what this server can do + await requestContext.SendResult( + new InitializeResult + { + Capabilities = new ServerCapabilities + { + DefinitionProvider = false, + ReferencesProvider = false, + DocumentFormattingProvider = false, + DocumentRangeFormattingProvider = false, + DocumentHighlightProvider = false, + HoverProvider = false + } + }); + } + + /// + /// Handles the version request. Sends back the server version as result. + /// + private static async Task HandleVersionRequest( + object versionRequestParams, + RequestContext requestContext) + { + await requestContext.SendResult(serviceVersion.ToString()); + } + + #endregion + } +} diff --git a/src/Microsoft.SqlTools.Credentials/HostLoader.cs b/src/Microsoft.SqlTools.Credentials/HostLoader.cs index 21da458b..4d35a823 100644 --- a/src/Microsoft.SqlTools.Credentials/HostLoader.cs +++ b/src/Microsoft.SqlTools.Credentials/HostLoader.cs @@ -2,14 +2,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Credentials; -using Microsoft.SqlTools.ServiceLayer.Extensibility; -using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Extensibility; +using Microsoft.SqlTools.Hosting; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.SqlContext; namespace Microsoft.SqlTools.Credentials @@ -23,9 +18,9 @@ namespace Microsoft.SqlTools.Credentials private static object lockObject = new object(); private static bool isLoaded; - internal static ServiceHost CreateAndStartServiceHost(SqlToolsContext sqlToolsContext) + internal static CredentialsServiceHost CreateAndStartServiceHost(SqlToolsContext sqlToolsContext) { - ServiceHost serviceHost = ServiceHost.Instance; + CredentialsServiceHost serviceHost = CredentialsServiceHost.Instance; lock (lockObject) { if (!isLoaded) @@ -45,7 +40,7 @@ namespace Microsoft.SqlTools.Credentials return serviceHost; } - private static void InitializeRequestHandlersAndServices(ServiceHost serviceHost, SqlToolsContext sqlToolsContext) + private static void InitializeRequestHandlersAndServices(CredentialsServiceHost serviceHost, SqlToolsContext sqlToolsContext) { // Load extension provider, which currently finds all exports in current DLL. Can be changed to find based // on directory or assembly list quite easily in the future diff --git a/src/Microsoft.SqlTools.Credentials/Program.cs b/src/Microsoft.SqlTools.Credentials/Program.cs index eb97091e..b34bad42 100644 --- a/src/Microsoft.SqlTools.Credentials/Program.cs +++ b/src/Microsoft.SqlTools.Credentials/Program.cs @@ -4,9 +4,8 @@ using System; using Microsoft.SqlTools.Credentials.Utility; -using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.Credentials { @@ -39,7 +38,7 @@ namespace Microsoft.SqlTools.Credentials version: new Version(1, 0)); SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails); - ServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext); + CredentialsServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext); serviceHost.WaitForExit(); } diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs index 620354a7..8cdc27c6 100644 --- a/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs +++ b/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs @@ -13,9 +13,9 @@ using System.Linq; using System.Reflection; using System.Runtime.Loader; using Microsoft.Extensions.DependencyModel; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Extensibility +namespace Microsoft.SqlTools.Extensibility { public class ExtensionServiceProvider : RegisteredServiceProvider { diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs index 072b12e5..95edeeb6 100644 --- a/src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs +++ b/src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs @@ -4,7 +4,7 @@ // -namespace Microsoft.SqlTools.ServiceLayer.Extensibility +namespace Microsoft.SqlTools.Extensibility { /// /// A Service that expects to lookup other services. Using this interface on an exported service diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/IEnumerableExt.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/IEnumerableExt.cs index 07412622..5f332b24 100644 --- a/src/Microsoft.SqlTools.Hosting/Extensibility/IEnumerableExt.cs +++ b/src/Microsoft.SqlTools.Hosting/Extensibility/IEnumerableExt.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; -namespace Microsoft.SqlTools.ServiceLayer.Extensibility +namespace Microsoft.SqlTools.Extensibility { internal static class IEnumerableExt diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/IMultiServiceProvider.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/IMultiServiceProvider.cs index 5a11065d..854329a3 100644 --- a/src/Microsoft.SqlTools.Hosting/Extensibility/IMultiServiceProvider.cs +++ b/src/Microsoft.SqlTools.Hosting/Extensibility/IMultiServiceProvider.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Extensibility +namespace Microsoft.SqlTools.Extensibility { public interface IMultiServiceProvider { diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs index 5f7f2fac..768f7ec8 100644 --- a/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs +++ b/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs @@ -10,9 +10,9 @@ using System.Globalization; using System.Linq; using System.Reflection; using Microsoft.SqlTools.Hosting; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Extensibility +namespace Microsoft.SqlTools.Extensibility { /// diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs index 397deceb..ca7ec248 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs @@ -4,7 +4,7 @@ // -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { /// /// Defines a class that describes the capabilities of a language diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/DmpServerCapabilities.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/DmpServerCapabilities.cs new file mode 100644 index 00000000..d38efe0f --- /dev/null +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/DmpServerCapabilities.cs @@ -0,0 +1,15 @@ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +namespace Microsoft.SqlTools.Hosting.Contracts +{ + public class DmpServerCapabilities + { + public string ProviderName { get; set; + } + public bool? HoverProvider { get; set; } + } +} + diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/HostingErrorEvent.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/HostingErrorEvent.cs index d6e65801..beb9139c 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/HostingErrorEvent.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/HostingErrorEvent.cs @@ -3,9 +3,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { /// /// Parameters to be used for reporting hosting-level errors, such as protocol violations diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Initialize.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Initialize.cs index 215edf87..72682e44 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Initialize.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Initialize.cs @@ -3,9 +3,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { public class InitializeRequest { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ServerCapabilities.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ServerCapabilities.cs index cba641da..2af47bf5 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ServerCapabilities.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ServerCapabilities.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { public class ServerCapabilities { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Shutdown.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Shutdown.cs index 1ccb9cfc..879474b7 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Shutdown.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Shutdown.cs @@ -3,9 +3,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { /// /// Defines a message that is sent from the client to request diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/VersionRequest.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/VersionRequest.cs index ed7ab358..87718440 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/VersionRequest.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Contracts/VersionRequest.cs @@ -3,9 +3,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts +namespace Microsoft.SqlTools.Hosting.Contracts { /// /// Defines a message that is sent from the client to request diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/IHostedService.cs b/src/Microsoft.SqlTools.Hosting/Hosting/IHostedService.cs index 848c5820..66d63fdc 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/IHostedService.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/IHostedService.cs @@ -4,10 +4,10 @@ // using System; -using Microsoft.SqlTools.ServiceLayer.Extensibility; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Extensibility; +using Microsoft.SqlTools.Hosting.Protocol; -namespace Microsoft.SqlTools.ServiceLayer.Hosting +namespace Microsoft.SqlTools.Hosting { /// /// Defines a hosted service that communicates with external processes via diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/ChannelBase.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/ChannelBase.cs index 48cd66aa..de7886ce 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/ChannelBase.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/ChannelBase.cs @@ -4,9 +4,9 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel +namespace Microsoft.SqlTools.Hosting.Protocol.Channel { /// /// Defines a base implementation for servers and their clients over a diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioClientChannel.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioClientChannel.cs index 02b79c6b..aa4339fc 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioClientChannel.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioClientChannel.cs @@ -7,9 +7,9 @@ using System.Diagnostics; using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel +namespace Microsoft.SqlTools.Hosting.Protocol.Channel { /// /// Provides a client implementation for the standard I/O channel. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioServerChannel.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioServerChannel.cs index 204a9908..de669e04 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioServerChannel.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioServerChannel.cs @@ -6,9 +6,9 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel +namespace Microsoft.SqlTools.Hosting.Protocol.Channel { /// /// Provides a server implementation for the standard I/O channel. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Constants.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Constants.cs index 7daa6b97..94572c4a 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Constants.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Constants.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public static class Constants { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/EventType.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/EventType.cs index 4d9a251b..6e57f993 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/EventType.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/EventType.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts +namespace Microsoft.SqlTools.Hosting.Protocol.Contracts { /// /// Defines an event type with a particular method name. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/Message.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/Message.cs index 6af6a101..284d8dc0 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/Message.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/Message.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts +namespace Microsoft.SqlTools.Hosting.Protocol.Contracts { /// /// Defines all possible message types. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/RequestType.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/RequestType.cs index 67676259..3b0cd4f4 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/RequestType.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/RequestType.cs @@ -5,7 +5,7 @@ using System.Diagnostics; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts +namespace Microsoft.SqlTools.Hosting.Protocol.Contracts { [DebuggerDisplay("RequestType MethodName = {MethodName}")] public class RequestType diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/EventContext.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/EventContext.cs index 42202a28..47225c56 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/EventContext.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/EventContext.cs @@ -4,9 +4,9 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { /// /// Provides context for a received event so that handlers diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IEventSender.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IEventSender.cs index f625a88e..f460731c 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IEventSender.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IEventSender.cs @@ -4,9 +4,9 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public interface IEventSender { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IProtocolEndpoint.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IProtocolEndpoint.cs index 0450b124..e0adefab 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IProtocolEndpoint.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IProtocolEndpoint.cs @@ -5,9 +5,9 @@ using System; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { /// /// A ProtocolEndpoint is used for inter-process communication. Services can register to diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IRequestSender.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IRequestSender.cs index ca69f5b3..c1b6fbfe 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IRequestSender.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IRequestSender.cs @@ -4,9 +4,9 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public interface IRequestSender { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs index 4c711cdb..89286a54 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs @@ -8,12 +8,12 @@ using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public class MessageDispatcher { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageParseException.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageParseException.cs index b4ef94c2..1932134c 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageParseException.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageParseException.cs @@ -5,7 +5,7 @@ using System; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public class MessageParseException : Exception { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageProtocolType.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageProtocolType.cs index 480332fa..cc13746f 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageProtocolType.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageProtocolType.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { /// /// Defines the possible message protocol types. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs index 392af134..876b39d7 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs @@ -9,12 +9,12 @@ using System.IO; using System.Text; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Utility; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public class MessageReader { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs index 8b0c0cef..fb140763 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs @@ -6,13 +6,13 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Utility; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public class MessageWriter { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs index 9c9eda9e..56678b44 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs @@ -7,11 +7,11 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Utility; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { /// /// Provides behavior for a client or server endpoint that diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs index ff2f4717..da675f71 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs @@ -4,10 +4,10 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol +namespace Microsoft.SqlTools.Hosting.Protocol { public class RequestContext : IEventSender { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/IMessageSerializer.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/IMessageSerializer.cs index 6a1133ff..1a0aea69 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/IMessageSerializer.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/IMessageSerializer.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers +namespace Microsoft.SqlTools.Hosting.Protocol.Serializers { /// /// Defines a common interface for message serializers. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs index 0ccca078..762f586b 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers +namespace Microsoft.SqlTools.Hosting.Protocol.Serializers { /// /// Serializes messages in the JSON RPC format. Used primarily diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/V8MessageSerializer.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/V8MessageSerializer.cs index f0e144e6..6df2a8df 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/V8MessageSerializer.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/V8MessageSerializer.cs @@ -5,9 +5,9 @@ using Newtonsoft.Json.Linq; using System; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; -namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers +namespace Microsoft.SqlTools.Hosting.Protocol.Serializers { /// /// Serializes messages in the V8 format. Used primarily for debug adapters. diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostBase.cs b/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostBase.cs index 8158822b..38fe2290 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostBase.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostBase.cs @@ -4,11 +4,11 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; -namespace Microsoft.SqlTools.ServiceLayer.Hosting +namespace Microsoft.SqlTools.Hosting { public abstract class ServiceHostBase : ProtocolEndpoint { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostEditorOperations.cs b/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostEditorOperations.cs index e5714b19..3d4a1fc2 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostEditorOperations.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostEditorOperations.cs @@ -3,12 +3,12 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // #if false -using Microsoft.SqlTools.EditorServices.Extensions; -using Microsoft.SqlTools.EditorServices.Protocol.LanguageServer; -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol; +using Microsoft.SqlTools.Extensions; +using Microsoft.SqlTools.Protocol.LanguageServer; +using Microsoft.SqlTools.Protocol.MessageProtocol; using System.Threading.Tasks; -namespace Microsoft.SqlTools.EditorServices.Protocol.Server +namespace Microsoft.SqlTools.Protocol.Server { internal class LanguageServerEditorOperations : IEditorOperations { diff --git a/src/Microsoft.SqlTools.Hosting/Utility/AsyncContext.cs b/src/Microsoft.SqlTools.Hosting/Utility/AsyncContext.cs index 79f2418f..6fc8e208 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/AsyncContext.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/AsyncContext.cs @@ -7,7 +7,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Simplifies the setup of a SynchronizationContext for the use diff --git a/src/Microsoft.SqlTools.Hosting/Utility/AsyncContextThread.cs b/src/Microsoft.SqlTools.Hosting/Utility/AsyncContextThread.cs index 12e3f6fa..a1d445be 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/AsyncContextThread.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/AsyncContextThread.cs @@ -7,7 +7,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Provides a simplified interface for creating a new thread diff --git a/src/Microsoft.SqlTools.Hosting/Utility/AsyncLock.cs b/src/Microsoft.SqlTools.Hosting/Utility/AsyncLock.cs index c8dbd49a..d2e792d6 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/AsyncLock.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/AsyncLock.cs @@ -7,7 +7,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Provides a simple wrapper over a SemaphoreSlim to allow diff --git a/src/Microsoft.SqlTools.Hosting/Utility/AsyncQueue.cs b/src/Microsoft.SqlTools.Hosting/Utility/AsyncQueue.cs index e71f8cec..bedb4fd2 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/AsyncQueue.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/AsyncQueue.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Provides a synchronized queue which can be used from within async diff --git a/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs b/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs index f6306a17..94a3d9cf 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs @@ -5,7 +5,7 @@ using System; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { public static class ObjectExtensions { diff --git a/src/Microsoft.SqlTools.Hosting/Utility/Logger.cs b/src/Microsoft.SqlTools.Hosting/Utility/Logger.cs index 4f1a27a3..fa6dedf8 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/Logger.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/Logger.cs @@ -9,7 +9,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Text; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Defines the level indicators for log messages. diff --git a/src/Microsoft.SqlTools.Hosting/Utility/LongList.cs b/src/Microsoft.SqlTools.Hosting/Utility/LongList.cs index 306019df..f1cc7ad8 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/LongList.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/LongList.cs @@ -7,7 +7,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Collection class that permits storage of over int.MaxValue items. This is performed diff --git a/src/Microsoft.SqlTools.Hosting/Utility/TextUtilities.cs b/src/Microsoft.SqlTools.Hosting/Utility/TextUtilities.cs index f4b5cb60..fce1389c 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/TextUtilities.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/TextUtilities.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { public static class TextUtilities { diff --git a/src/Microsoft.SqlTools.Hosting/Utility/ThreadSynchronizationContext.cs b/src/Microsoft.SqlTools.Hosting/Utility/ThreadSynchronizationContext.cs index 7bd9a97d..ce3c65fe 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/ThreadSynchronizationContext.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/ThreadSynchronizationContext.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Concurrent; using System.Threading; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Provides a SynchronizationContext implementation that can be used diff --git a/src/Microsoft.SqlTools.Hosting/Utility/Validate.cs b/src/Microsoft.SqlTools.Hosting/Utility/Validate.cs index 77d1a13d..39f2dd74 100644 --- a/src/Microsoft.SqlTools.Hosting/Utility/Validate.cs +++ b/src/Microsoft.SqlTools.Hosting/Utility/Validate.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.SqlTools.ServiceLayer.Utility +namespace Microsoft.SqlTools.Utility { /// /// Provides common validation methods to simplify method diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs index 5bf02386..a35b53ce 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs index f1083314..32f98b9e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs @@ -10,7 +10,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs index 57f4249e..af68081a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs @@ -13,7 +13,7 @@ using System.Globalization; using System.IO; using System.Text; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs index fcf2a394..243f0a53 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs @@ -4,7 +4,7 @@ // using System.Collections.Specialized; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionInfo.cs index 168af4a7..2d82f3ce 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionInfo.cs @@ -7,9 +7,8 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Data.Common; -using System.Linq; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs index 180a3c1b..ae846247 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs @@ -12,14 +12,14 @@ using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlServer.Management.Common; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/CancelConnectRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/CancelConnectRequest.cs index a284f317..0325a219 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/CancelConnectRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/CancelConnectRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionChangedNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionChangedNotification.cs index c0daee6d..ea42598b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionChangedNotification.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionChangedNotification.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionCompleteNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionCompleteNotification.cs index 0203a110..eee0cff8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionCompleteNotification.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionCompleteNotification.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionRequest.cs index 74320bdd..c3bcd0d7 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/DisconnectRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/DisconnectRequest.cs index cbf67ef2..3452dbeb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/DisconnectRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/DisconnectRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ListDatabasesRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ListDatabasesRequest.cs index 01c12a45..a069b8a1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ListDatabasesRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ListDatabasesRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs index f1022ecb..3de3b634 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs index 0610fff4..3c22d368 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs @@ -8,7 +8,7 @@ using System.Collections.Concurrent; using System.Data; using System.Data.SqlClient; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs index e2652b42..d9b96397 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs @@ -6,7 +6,7 @@ using System; using System.Data; using System.Data.SqlClient; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs index 2c340ef0..dcd38936 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs @@ -6,7 +6,7 @@ using System; using System.Data; using System.Data.SqlClient; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs index 4a5a559e..8256c3dc 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs @@ -11,7 +11,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Security; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlServer.Management.Common; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs index 37ae5cd6..73f50b15 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs @@ -33,7 +33,7 @@ using System.Globalization; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs index 74be5faf..0efd9a04 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs @@ -4,7 +4,7 @@ // using System.Data.SqlClient; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs index 37be0b15..f8f4ed44 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs @@ -29,7 +29,7 @@ using System.Diagnostics; using System.Diagnostics.Contracts; using System.Globalization; using System.Threading; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs index 8e42894a..bb75fbf5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs @@ -6,7 +6,7 @@ using System; using System.Diagnostics; using System.Globalization; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs index c8b86091..6a3c103e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data.SqlClient; using System.Runtime.InteropServices; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditCreateRowRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditCreateRowRequest.cs index 2e4d7619..e3b3a0b9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditCreateRowRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditCreateRowRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDeleteRowRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDeleteRowRequest.cs index 248adcfb..c575bdab 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDeleteRowRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDeleteRowRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDisposeRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDisposeRequest.cs index 2520eb2c..31116756 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDisposeRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditDisposeRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditInitializeRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditInitializeRequest.cs index 72998823..b03c0ff3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditInitializeRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditInitializeRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRevertRowRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRevertRowRequest.cs index 53049b67..df8c7012 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRevertRowRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRevertRowRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditSessionReadyEvent.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditSessionReadyEvent.cs index 150b53c7..e0453701 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditSessionReadyEvent.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditSessionReadyEvent.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditUpdateCellRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditUpdateCellRequest.cs index b6114713..c93eab9d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditUpdateCellRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditUpdateCellRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditDataService.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditDataService.cs index 3f3c9cf1..d42c6b49 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditDataService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditDataService.cs @@ -7,13 +7,14 @@ using System; using System.Collections.Concurrent; using System.Data.Common; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.EditData.Contracts; using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests; using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using ConnectionType = Microsoft.SqlTools.ServiceLayer.Connection.ConnectionType; namespace Microsoft.SqlTools.ServiceLayer.EditData diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditTableMetadata.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditTableMetadata.cs index 21831a13..9f12416d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditTableMetadata.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditTableMetadata.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Diagnostics; using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Utility; namespace Microsoft.SqlTools.ServiceLayer.EditData diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Session.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Session.cs index 3099b4d5..b5b1f346 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Session.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Session.cs @@ -10,7 +10,7 @@ using System.Linq; using Microsoft.SqlTools.ServiceLayer.EditData.Contracts; using Microsoft.SqlTools.ServiceLayer.EditData.UpdateManagement; using Microsoft.SqlTools.ServiceLayer.QueryExecution; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.EditData { diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/CellUpdate.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/CellUpdate.cs index d818b6b8..f802ef09 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/CellUpdate.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/CellUpdate.cs @@ -7,7 +7,7 @@ using System; using System.Data.Common; using System.Globalization; using System.Text.RegularExpressions; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.EditData.UpdateManagement { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Contracts/DocumentFormatting.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Contracts/DocumentFormatting.cs index 1d2778a4..35045985 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Contracts/DocumentFormatting.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Contracts/DocumentFormatting.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/ASTNodeFormatterT.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/ASTNodeFormatterT.cs index ad00970d..29a74ab5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/ASTNodeFormatterT.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/ASTNodeFormatterT.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.Parser; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/AstNodeFormatterFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/AstNodeFormatterFactory.cs index ec312280..a4eb7d85 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/AstNodeFormatterFactory.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/AstNodeFormatterFactory.cs @@ -5,7 +5,7 @@ using System; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/CommaSeparatedListFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/CommaSeparatedListFormatter.cs index 3cea4509..cca69be7 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/CommaSeparatedListFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/CommaSeparatedListFormatter.cs @@ -7,7 +7,7 @@ using System; using System.Diagnostics; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor.cs index c8659e04..c5498a18 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor.cs @@ -9,7 +9,7 @@ using System.Globalization; using System.Linq; using Microsoft.SqlServer.Management.SqlParser.Parser; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Extensibility; +using Microsoft.SqlTools.Extensibility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs index 1677a4f7..0a3933d0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Composition; using System.Diagnostics; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs index 1a3ba964..bff5778a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs @@ -6,7 +6,7 @@ using System; using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryQueryExpressionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryQueryExpressionFormatter.cs index f48c6f5e..72f56fed 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryQueryExpressionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryQueryExpressionFormatter.cs @@ -8,7 +8,7 @@ using System.Composition; using System.Diagnostics; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlColumnDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlColumnDefinitionFormatter.cs index 3582bbd0..d34198d0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlColumnDefinitionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlColumnDefinitionFormatter.cs @@ -5,7 +5,7 @@ using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs index 326476c7..0c8cee1e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs @@ -8,7 +8,7 @@ using System.Composition; using System.Diagnostics; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlFromClauseFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlFromClauseFormatter.cs index 0a33dfcb..c7d84ef9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlFromClauseFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlFromClauseFormatter.cs @@ -5,7 +5,7 @@ using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs index 1291807c..762ecbcb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs @@ -7,7 +7,7 @@ using System; using System.Composition; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQualifiedJoinTableExpressionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQualifiedJoinTableExpressionFormatter.cs index 150c3150..f67a1a30 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQualifiedJoinTableExpressionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQualifiedJoinTableExpressionFormatter.cs @@ -5,7 +5,7 @@ using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQuerySpecificationFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQuerySpecificationFormatter.cs index c90993f7..2bb13dc1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQuerySpecificationFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlQuerySpecificationFormatter.cs @@ -5,7 +5,7 @@ using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectClauseFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectClauseFormatter.cs index 17ab0ed3..d0153991 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectClauseFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectClauseFormatter.cs @@ -5,7 +5,7 @@ using System.Composition; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs index 53574b5e..a70f85c3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs @@ -9,7 +9,7 @@ using System.Diagnostics; using System.Globalization; using Babel.ParserGenerator; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs index 4b20e059..fbf7d127 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Composition; using System.Linq; using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/WhiteSpaceSeparatedListFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/WhiteSpaceSeparatedListFormatter.cs index 3d55f4e2..b03367dd 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/WhiteSpaceSeparatedListFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/WhiteSpaceSeparatedListFormatter.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/TSqlFormatterService.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/TSqlFormatterService.cs index 137c6378..e7d7a740 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/TSqlFormatterService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/TSqlFormatterService.cs @@ -9,16 +9,16 @@ using System.Composition; using System.IO; using System.Threading.Tasks; using Microsoft.SqlServer.Management.SqlParser.Parser; -using Microsoft.SqlTools.ServiceLayer.Extensibility; +using Microsoft.SqlTools.Extensibility; +using Microsoft.SqlTools.Hosting; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Formatter.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Formatter { diff --git a/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs b/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs index cf65824e..2395a201 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs @@ -2,16 +2,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.SqlTools.Credentials; +using Microsoft.SqlTools.Extensibility; +using Microsoft.SqlTools.Hosting; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; -using Microsoft.SqlTools.ServiceLayer.Credentials; using Microsoft.SqlTools.ServiceLayer.EditData; -using Microsoft.SqlTools.ServiceLayer.Extensibility; using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.SqlContext; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs index f23a57b0..9953ab0c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs @@ -14,7 +14,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs index bf78583e..cb326bbc 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/SqlCompletionItem.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/SqlCompletionItem.cs index 621400d1..ea319866 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/SqlCompletionItem.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/SqlCompletionItem.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Text.RegularExpressions; using Microsoft.SqlServer.Management.SqlParser.Intellisense; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs index b018bc97..9ecd7763 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs @@ -4,7 +4,7 @@ // using System.Diagnostics; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs index 61ba3f82..947ddd4e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs index 73d75e5e..54c17871 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs index 968e390b..ee7eeae9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs index e758aa3d..5745e431 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs index 5de004d5..495d7ad9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs @@ -4,7 +4,7 @@ // using System.Collections.Generic; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs index fbce0883..216fee10 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs index fc5bc289..2f6366f8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/IntelliSenseReady.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/IntelliSenseReady.cs index 4b61e4b7..c50a1c64 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/IntelliSenseReady.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/IntelliSenseReady.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/RebuildIntelliSenseNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/RebuildIntelliSenseNotification.cs index f5c52591..d1927496 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/RebuildIntelliSenseNotification.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/RebuildIntelliSenseNotification.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs index 90b0b3f6..f366802d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs index d8cf3f48..e92de85d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs index e8fab16b..ee43d655 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/StatusChangedNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/StatusChangedNotification.cs index 4e5d1b92..41857ca0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/StatusChangedNotification.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/StatusChangedNotification.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/TelemetryNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/TelemetryNotification.cs index 9e66f7b6..3ffeb594 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/TelemetryNotification.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/TelemetryNotification.cs @@ -4,7 +4,7 @@ // using System.Collections.Generic; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs index 0c493b0f..41de8b55 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DocumentStatusHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DocumentStatusHelper.cs index 13a5e374..bb1e57b8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DocumentStatusHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DocumentStatusHelper.cs @@ -4,9 +4,9 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs index db04157f..829b3f9f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs @@ -8,7 +8,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs index db02ace3..db2cc4d0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs @@ -14,18 +14,18 @@ using Microsoft.SqlServer.Management.SqlParser.Binder; using Microsoft.SqlServer.Management.SqlParser.Common; using Microsoft.SqlServer.Management.SqlParser.Intellisense; using Microsoft.SqlServer.Management.SqlParser.Parser; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.QueryExecution; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location; +using Microsoft.SqlTools.ServiceLayer.Hosting; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinition.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinition.cs index 6deeb235..1184c033 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinition.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinition.cs @@ -13,10 +13,10 @@ using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.SqlParser.Intellisense; using Microsoft.SqlServer.Management.SqlParser.Parser; using Microsoft.SqlServer.Management.SqlParser.MetadataProvider; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.QueryExecution; -using Microsoft.SqlTools.ServiceLayer.Utility; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location; using ConnectionType = Microsoft.SqlTools.ServiceLayer.Connection.ConnectionType; diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinitionScripts.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinitionScripts.cs index ca20816d..82c27138 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinitionScripts.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/PeekDefinitionScripts.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using Microsoft.SqlServer.Management.Smo; using Microsoft.SqlServer.Management.SqlParser.Intellisense; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { internal partial class PeekDefinition diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptDocumentInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptDocumentInfo.cs index 2735abea..9a1ae4a7 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptDocumentInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptDocumentInfo.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlServer.Management.SqlParser.Parser; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion diff --git a/src/Microsoft.SqlTools.ServiceLayer/Program.cs b/src/Microsoft.SqlTools.ServiceLayer/Program.cs index 1d1310a7..13bab0b6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Program.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Program.cs @@ -5,6 +5,7 @@ using System; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs index d44b78f8..1e7518d6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs index 9cbf438c..7f77e45e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs @@ -8,7 +8,7 @@ using System.Data; using System.Data.Common; using System.Data.SqlTypes; using System.Diagnostics; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/BatchEvents.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/BatchEvents.cs index d911ac9a..6021e6df 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/BatchEvents.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/BatchEvents.cs @@ -2,7 +2,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteDocumentSelectionRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteDocumentSelectionRequest.cs index cb965d2c..418e7d96 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteDocumentSelectionRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteDocumentSelectionRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteStringRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteStringRequest.cs index 883808ab..49edc857 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteStringRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ExecuteStringRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/MessageEvent.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/MessageEvent.cs index f655e72f..f67c5de1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/MessageEvent.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/MessageEvent.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/QueryCompleteEvent.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/QueryCompleteEvent.cs index ec73d7d7..838aed0f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/QueryCompleteEvent.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/QueryCompleteEvent.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs index 8da94cd0..9121449c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs @@ -2,7 +2,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryCancelRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryCancelRequest.cs index 3eb87f4f..d6ffc362 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryCancelRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryCancelRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryDisposeRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryDisposeRequest.cs index d242d714..40b7e3ed 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryDisposeRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryDisposeRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryExecutionPlanRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryExecutionPlanRequest.cs index 910e89c0..132be46a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryExecutionPlanRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/QueryExecutionPlanRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SaveResultsRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SaveResultsRequest.cs index 6ad4f4b5..517bfe88 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SaveResultsRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SaveResultsRequest.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SubsetRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SubsetRequest.cs index f9fd2e5d..aec9ee07 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SubsetRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SubsetRequest.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs index 78e43d3b..5060e1fe 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamReader.cs @@ -10,7 +10,7 @@ using System.IO; using System.Text; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamWriter.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamWriter.cs index c56d43e1..42f1c512 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamWriter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/ServiceBufferFileStreamWriter.cs @@ -11,7 +11,7 @@ using System.IO; using System.Text; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs index 3bc85c23..5a82cb5a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs @@ -14,7 +14,7 @@ using System.Threading; using System.Threading.Tasks; using System.Xml; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs index e6db27ec..3a62c9f9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs @@ -14,7 +14,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; using System.Collections.Generic; diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs index 4af4eb20..3829f5a2 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs @@ -7,15 +7,15 @@ using System.Collections.Concurrent; using System.IO; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.Connection; -using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests; using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; +using Microsoft.SqlTools.Utility; +using Microsoft.SqlTools.ServiceLayer.Hosting; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution { diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs index 83055228..8f59425b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs @@ -12,7 +12,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.QueryExecution { diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHost.cs b/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs similarity index 97% rename from src/Microsoft.SqlTools.Hosting/Hosting/ServiceHost.cs rename to src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs index c33a289f..1bddc4cb 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/ServiceHost.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ServiceHost.cs @@ -8,10 +8,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting; +using Microsoft.SqlTools.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Hosting { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Utility/SqlScriptFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/SqlScriptFormatter.cs index 25722ddc..733ada2e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Utility/SqlScriptFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Utility/SqlScriptFormatter.cs @@ -10,6 +10,7 @@ using System.Globalization; using System.Linq; using System.Text; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Utility { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs index af50835f..b8ee0a75 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs index 463da178..275d9a51 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs index cf3f8468..362b044a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs @@ -4,7 +4,7 @@ // using System.Diagnostics; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs index 93140df3..cf139e72 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs index c2beb65b..894d0452 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs @@ -9,7 +9,7 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Workspace diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs index c3b6b672..09b178df 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs @@ -8,10 +8,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Hosting; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Workspace { diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs index 25eb7f3a..fb15dfed 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Data.SqlClient; using System.Threading; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.TSQLExecutionEngine { diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Program.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Program.cs index 0d920084..175384c9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Program.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Program.cs @@ -6,7 +6,7 @@ using System; using Microsoft.SqlTools.ServiceLayer.TestDriver.Driver; using Microsoft.SqlTools.ServiceLayer.TestDriver.Utility; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.PerfTests { diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConnectionProfileService.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConnectionProfileService.cs index 7a18ab7d..190f762d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConnectionProfileService.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConnectionProfileService.cs @@ -6,8 +6,8 @@ using System; using System.Collections.Generic; using System.Globalization; +using Microsoft.SqlTools.Credentials.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.Test.Common diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestCredentialService.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestCredentialService.cs index 18d5f72c..9edb34da 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestCredentialService.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestCredentialService.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Globalization; -using Microsoft.SqlTools.ServiceLayer.Credentials; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; +using Microsoft.SqlTools.Credentials; +using Microsoft.SqlTools.Credentials.Contracts; namespace Microsoft.SqlTools.ServiceLayer.Test.Common { diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs index 0f038756..00f3146b 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs @@ -4,9 +4,9 @@ // using System; +using Microsoft.SqlTools.Credentials; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Credentials; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.SqlContext; diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs index 2453f112..9cfdee24 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.TestDriver.Driver; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/WorkspaceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/WorkspaceTests.cs index 31a400d0..667bf955 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/WorkspaceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/WorkspaceTests.cs @@ -5,7 +5,7 @@ using System.IO; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Contracts; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs index 01d50f08..ed4a6b30 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs @@ -15,8 +15,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests; diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/TestDriverBase.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/TestDriverBase.cs index dcc352aa..27082d76 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/TestDriverBase.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/TestDriverBase.cs @@ -12,10 +12,10 @@ using System; using System.Collections.Concurrent; using System.Diagnostics; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Driver { diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs index eefe0bd0..8efe3984 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Connection/ConnectionServiceTests.cs @@ -11,9 +11,9 @@ using System.Data.SqlClient; using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility; using Moq; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/CredentialServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/CredentialServiceTests.cs index eeea43db..3d29d4d7 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/CredentialServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/CredentialServiceTests.cs @@ -7,9 +7,9 @@ using System; using System.IO; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Credentials; -using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts; -using Microsoft.SqlTools.ServiceLayer.Credentials.Linux; +using Microsoft.SqlTools.Credentials; +using Microsoft.SqlTools.Credentials.Contracts; +using Microsoft.SqlTools.Credentials.Linux; using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Linux/LinuxInteropTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Linux/LinuxInteropTests.cs index 7747049d..0d43bb84 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Linux/LinuxInteropTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Linux/LinuxInteropTests.cs @@ -3,8 +3,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Credentials; -using Microsoft.SqlTools.ServiceLayer.Credentials.Linux; +using Microsoft.SqlTools.Credentials; +using Microsoft.SqlTools.Credentials.Linux; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/CredentialSetTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/CredentialSetTests.cs index 37c55652..07337c7a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/CredentialSetTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/CredentialSetTests.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.SqlTools.ServiceLayer.Credentials.Win32; +using Microsoft.SqlTools.Credentials.Win32; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/Win32CredentialTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/Win32CredentialTests.cs index 3897c6d0..ee42f4ea 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/Win32CredentialTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Credentials/Win32/Win32CredentialTests.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.SqlTools.ServiceLayer.Credentials.Win32; +using Microsoft.SqlTools.Credentials.Win32; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs index 11c7b7a2..864ab8b8 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs @@ -13,7 +13,7 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Moq; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ExtensionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ExtensionTests.cs index 406af03c..1dd380d9 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ExtensionTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ExtensionTests.cs @@ -7,7 +7,7 @@ using System; using System.Composition; using System.Linq; using System.Reflection; -using Microsoft.SqlTools.ServiceLayer.Extensibility; +using Microsoft.SqlTools.Extensibility; using Microsoft.SqlTools.ServiceLayer.Formatter; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ServiceProviderTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ServiceProviderTests.cs index 3d7b5c1f..f55aff15 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ServiceProviderTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Extensibility/ServiceProviderTests.cs @@ -5,7 +5,7 @@ using System; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Extensibility; +using Microsoft.SqlTools.Extensibility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Extensibility diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterUnitTestBase.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterUnitTestBase.cs index d2654e76..79e01577 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterUnitTestBase.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterUnitTestBase.cs @@ -5,9 +5,9 @@ using System.IO; using System.Reflection; -using Microsoft.SqlTools.ServiceLayer.Extensibility; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Extensibility; using Microsoft.SqlTools.ServiceLayer.Formatter; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Workspace; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs index 4083f047..2646802f 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs @@ -7,8 +7,8 @@ using System; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Formatter.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs index 21d8b8f7..c6125823 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs @@ -8,8 +8,8 @@ using System.Threading.Tasks; using Microsoft.SqlServer.Management.SqlParser.Binder; using Microsoft.SqlServer.Management.SqlParser.MetadataProvider; using Microsoft.SqlServer.Management.SqlParser.Parser; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.Connection; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs index ffb714f5..8691b50a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs @@ -12,9 +12,9 @@ using Microsoft.SqlServer.Management.SqlParser.Binder; using Microsoft.SqlServer.Management.SqlParser.Intellisense; using Microsoft.SqlServer.Management.SqlParser.MetadataProvider; using Microsoft.SqlServer.Management.SqlParser.Parser; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageDispatcherTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageDispatcherTests.cs index 562a4ef8..c82aad74 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageDispatcherTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageDispatcherTests.cs @@ -5,9 +5,9 @@ using System; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Channel; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Moq; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageReaderTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageReaderTests.cs index ab8a55df..10705299 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageReaderTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageReaderTests.cs @@ -6,9 +6,9 @@ using System; using System.IO; using System.Text; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageWriterTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageWriterTests.cs index 3c2fa514..ad5d7fad 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageWriterTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/MessageWriterTests.cs @@ -6,9 +6,9 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; using Newtonsoft.Json.Linq; using Xunit; @@ -65,7 +65,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Messaging // Write the message and then roll back the stream to be read // TODO: This will need to be redone! - await messageWriter.WriteMessage(Hosting.Protocol.Contracts.Message.Event("testEvent", null)); + await messageWriter.WriteMessage(SqlTools.Hosting.Protocol.Contracts.Message.Event("testEvent", null)); outputStream.Seek(0, SeekOrigin.Begin); string expectedHeaderString = string.Format(Constants.ContentLengthFormatString, diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/TestMessageTypes.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/TestMessageTypes.cs index 3ebdeab4..5022a9b7 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/TestMessageTypes.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Messaging/TestMessageTypes.cs @@ -4,7 +4,7 @@ // using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Messaging { diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Common.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Common.cs index 1da964d8..fd6b02d8 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Common.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Common.cs @@ -10,7 +10,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; -using HostingProtocol = Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests; @@ -21,6 +20,7 @@ using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Moq; using Moq.Protected; +using HostingProtocol = Microsoft.SqlTools.Hosting.Protocol; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution { @@ -72,7 +72,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution public static Batch GetBasicExecutedBatch() { - Batch batch = new Batch(Constants.StandardQuery, SubsectionDocument, 1, + Batch batch = new Batch(Test.Common.Constants.StandardQuery, SubsectionDocument, 1, MemoryFileSystem.GetFileStreamFactory()); batch.Execute(CreateTestConnection(StandardTestDataSet, false), CancellationToken.None).Wait(); return batch; @@ -80,7 +80,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution public static Batch GetExecutedBatchWithExecutionPlan() { - Batch batch = new Batch(Constants.StandardQuery, SubsectionDocument, 1, + Batch batch = new Batch(Test.Common.Constants.StandardQuery, SubsectionDocument, 1, MemoryFileSystem.GetFileStreamFactory()); batch.Execute(CreateTestConnection(ExecutionPlanTestDataSet, false), CancellationToken.None).Wait(); return batch; @@ -94,7 +94,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution // ConnectionInfo with the same URI as the query, so we will manually set it ConnectionService.Instance.OwnerToConnectionMap[ci.OwnerUri] = ci; - Query query = new Query(Constants.StandardQuery, ci, new QueryExecutionSettings(), + Query query = new Query(Test.Common.Constants.StandardQuery, ci, new QueryExecutionSettings(), MemoryFileSystem.GetFileStreamFactory()); query.Execute(); query.ExecutionTask.Wait(); @@ -109,7 +109,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution // ConnectionInfo with the same URI as the query, so we will manually set it ConnectionService.Instance.OwnerToConnectionMap[ci.OwnerUri] = ci; - Query query = new Query(Constants.StandardQuery, ci, querySettings, + Query query = new Query(Test.Common.Constants.StandardQuery, ci, querySettings, MemoryFileSystem.GetFileStreamFactory()); query.Execute(); query.ExecutionTask.Wait(); @@ -184,7 +184,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution { // Create a connection info and add the default connection to it ISqlConnectionFactory factory = CreateMockFactory(data, throwOnRead); - ConnectionInfo ci = new ConnectionInfo(factory, Constants.OwnerUri, StandardConnectionDetails); + ConnectionInfo ci = new ConnectionInfo(factory, Test.Common.Constants.OwnerUri, StandardConnectionDetails); ci.ConnectionTypeToConnectionMap[ConnectionType.Default] = factory.CreateSqlConnection(null); return ci; } @@ -198,7 +198,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution ConnectParams connectParams = new ConnectParams { Connection = StandardConnectionDetails, - OwnerUri = Constants.OwnerUri, + OwnerUri = Test.Common.Constants.OwnerUri, Type = type }; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SettingsTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SettingsTests.cs index fac9855e..7ff6ad58 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SettingsTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SettingsTests.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.QueryExecution; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncLockTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncLockTests.cs index ae20c212..3c08d060 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncLockTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncLockTests.cs @@ -6,7 +6,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncQueueTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncQueueTests.cs index 21fe11b5..27c903b0 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncQueueTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/AsyncQueueTests.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/JsonRpcMessageSerializerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/JsonRpcMessageSerializerTests.cs index 208d7412..8579942a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/JsonRpcMessageSerializerTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/JsonRpcMessageSerializerTests.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers; +using Microsoft.SqlTools.Hosting.Protocol.Serializers; using Newtonsoft.Json.Linq; using Xunit; -using HostingMessage = Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts.Message; +using HostingMessage = Microsoft.SqlTools.Hosting.Protocol.Contracts.Message; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost { diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/LoggerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/LoggerTests.cs index 191166ef..0ed5e85a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/LoggerTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/LoggerTests.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Linq; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs index 57505ea2..d35a1f54 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs @@ -4,6 +4,7 @@ using System; using System.Linq; +using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ServiceHostTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ServiceHostTests.cs index 9e945e58..d9707740 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ServiceHostTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ServiceHostTests.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; using Moq; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/EventFlowValidator.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/EventFlowValidator.cs index 567f3241..db1d24de 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/EventFlowValidator.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/EventFlowValidator.cs @@ -6,8 +6,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Moq; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/LongListTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/LongListTests.cs index 944723db..5fe0a89d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/LongListTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/LongListTests.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/RequestContextMocks.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/RequestContextMocks.cs index 92348324..613e7a83 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/RequestContextMocks.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/RequestContextMocks.cs @@ -5,8 +5,8 @@ using System; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; +using Microsoft.SqlTools.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Moq; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestUtils.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestUtils.cs index 2e07e9ee..624e99b1 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestUtils.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestUtils.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Moq; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TextUtilitiesTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TextUtilitiesTests.cs index e2e60797..1e649d32 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TextUtilitiesTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TextUtilitiesTests.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/ValidateTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/ValidateTests.cs index c2a7b4e8..4440520a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/ValidateTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/ValidateTests.cs @@ -4,7 +4,7 @@ // using System; -using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.Utility; using Xunit; namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Workspace/WorkspaceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Workspace/WorkspaceTests.cs index fbf48c9c..39e24373 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Workspace/WorkspaceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Workspace/WorkspaceTests.cs @@ -6,7 +6,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;