Fix namespaces for code moved to separate class libraries (#263)

* Create ServiceHost a service-specific class

* Renaming hosting namespace

* Rename credentials namespace

* Fix namespaces

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;
 

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
 {

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;

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
 {
     /// <summary>
     /// A Credential containing information needed to log into a resource. This is primarily 

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
 {
     /// <summary>
     /// Service responsible for securing credentials in a platform-neutral manner. This provides

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
 {
     /// <summary>
     /// An <see cref="ICredentialStore"/> support securely saving and retrieving passwords

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
     {

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
 {
     /// <summary>
     /// Simplified class to enable writing a set of credentials to/from disk

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

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

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

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
 {
     /// <summary>
     /// Store configuration struct

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
     {

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
     {

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
     {

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

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
 
 {
     /// <summary>

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
     {

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<Win32Credential>, IDisposable
     {

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 
     {

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
     {

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
     {

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
     {

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
 {
     /// <summary>
     /// Win32 implementation of the credential store

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
+{
+    /// <summary>
+    /// 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.
+    /// </summary>
+    public sealed class CredentialsServiceHost : ServiceHostBase
+    {
+        /// <summary>
+        /// This timeout limits the amount of time that shutdown tasks can take to complete
+        /// prior to the process shutting down.
+        /// </summary>
+        private const int ShutdownTimeoutInSeconds = 120;        
+
+        #region Singleton Instance Code
+
+        /// <summary>
+        /// Singleton instance of the service host for internal storage
+        /// </summary>
+        private static readonly Lazy<CredentialsServiceHost> instance = new Lazy<CredentialsServiceHost>(() => new CredentialsServiceHost());
+
+        /// <summary>
+        /// Current instance of the ServiceHost
+        /// </summary>
+        public static CredentialsServiceHost Instance
+        {
+            get { return instance.Value; }
+        }
+
+        /// <summary>
+        /// Constructs new instance of ServiceHost using the host and profile details provided.
+        /// Access is private to ensure only one instance exists at a time.
+        /// </summary>
+        private CredentialsServiceHost() : base(new StdioServerChannel())
+        {
+            // Initialize the shutdown activities
+            shutdownCallbacks = new List<ShutdownCallback>();
+            initializeCallbacks = new List<InitializeCallback>();
+        }
+
+        /// <summary>
+        /// Provide initialization that must occur after the service host is started
+        /// </summary>
+        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
+
+        /// <summary>
+        /// Delegate definition for the host shutdown event
+        /// </summary>
+        /// <param name="shutdownParams"></param>
+        /// <param name="shutdownRequestContext"></param>
+        public delegate Task ShutdownCallback(object shutdownParams, RequestContext<object> shutdownRequestContext);
+
+        /// <summary>
+        /// Delegate definition for the host initialization event
+        /// </summary>
+        /// <param name="startupParams"></param>
+        /// <param name="requestContext"></param>
+        public delegate Task InitializeCallback(InitializeRequest startupParams, RequestContext<InitializeResult> requestContext);
+
+        private readonly List<ShutdownCallback> shutdownCallbacks;
+
+        private readonly List<InitializeCallback> initializeCallbacks;
+
+        private static readonly Version serviceVersion = Assembly.GetEntryAssembly().GetName().Version;
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Adds a new callback to be called when the shutdown request is submitted
+        /// </summary>
+        /// <param name="callback">Callback to perform when a shutdown request is submitted</param>
+        public void RegisterShutdownTask(ShutdownCallback callback)
+        {
+            shutdownCallbacks.Add(callback);
+        }
+
+        /// <summary>
+        /// Add a new method to be called when the initialize request is submitted
+        /// </summary>
+        /// <param name="callback">Callback to perform when an initialize request is submitted</param>
+        public void RegisterInitializeTask(InitializeCallback callback)
+        {
+            initializeCallbacks.Add(callback);
+        }
+
+        #endregion
+
+        #region Request Handlers
+
+        /// <summary>
+        /// Handles the shutdown event for the Language Server
+        /// </summary>
+        private async Task HandleShutdownRequest(object shutdownParams, RequestContext<object> 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));
+        }
+
+        /// <summary>
+        /// Handles the initialization request
+        /// </summary>
+        /// <param name="initializeParams"></param>
+        /// <param name="requestContext"></param>
+        /// <returns></returns>
+        internal async Task HandleInitializeRequest(InitializeRequest initializeParams, RequestContext<InitializeResult> 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
+                    }
+                });
+        }
+
+        /// <summary>
+        /// Handles the version request. Sends back the server version as result.
+        /// </summary>
+        private static async Task HandleVersionRequest(
+          object versionRequestParams,
+          RequestContext<string> requestContext)
+        {
+            await requestContext.SendResult(serviceVersion.ToString());
+        }
+
+        #endregion
+    }
+}

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

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();
         }

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
     {

src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs

@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
     /// <summary>
     /// A Service that expects to lookup other services. Using this interface on an exported service

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

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
     {

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
 {
 
     /// <summary>

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs

@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     /// <summary>
     /// Defines a class that describes the capabilities of a language

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; }
+    }
+}
+

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
 {
     /// <summary>
     /// Parameters to be used for reporting hosting-level errors, such as protocol violations

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
     {

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
     {

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
 {
     /// <summary>
     /// Defines a message that is sent from the client to request

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
 {
     /// <summary>
     /// Defines a message that is sent from the client to request

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
 {
     /// <summary>
     /// Defines a hosted service that communicates with external processes via

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
 {
     /// <summary>
     /// Defines a base implementation for servers and their clients over a

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
 {
     /// <summary>
     /// Provides a client implementation for the standard I/O channel.

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
 {
     /// <summary>
     /// Provides a server implementation for the standard I/O channel.

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
     {

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
 {
     /// <summary>
     /// Defines an event type with a particular method name.

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
 {
     /// <summary>
     /// Defines all possible message types.

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<TParams, TResult>

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
 {
     /// <summary>
     /// Provides context for a received event so that handlers

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
     {

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
 {
     /// <summary>
     /// A ProtocolEndpoint is used for inter-process communication. Services can register to

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
     {

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
     {

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
     {

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
 {
     /// <summary>
     /// Defines the possible message protocol types.

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
     {

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
     {

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
 {
     /// <summary>
     /// Provides behavior for a client or server endpoint that

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<TResult> : IEventSender
     {

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
 {
     /// <summary>
     /// Defines a common interface for message serializers.

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
 {
     /// <summary>
     /// Serializes messages in the JSON RPC format.  Used primarily

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
 {
     /// <summary>
     /// Serializes messages in the V8 format.  Used primarily for debug adapters.

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
     {

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
     {

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
 {
     /// <summary>
     /// Simplifies the setup of a SynchronizationContext for the use

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
 {
     /// <summary>
     /// Provides a simplified interface for creating a new thread

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
 {
     /// <summary>
     /// Provides a simple wrapper over a SemaphoreSlim to allow

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
 {
     /// <summary>
     /// Provides a synchronized queue which can be used from within async

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
     {

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
 {
     /// <summary>
     /// Defines the level indicators for log messages.

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
 {
     /// <summary>
     /// Collection class that permits storage of over <c>int.MaxValue</c> items. This is performed

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
     {   

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
 {
     /// <summary>
     /// Provides a SynchronizationContext implementation that can be used

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
 {
     /// <summary>
     /// Provides common validation methods to simplify method

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;

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {