From f4c6589681a1b934a0a47f6ecb034fc28f571099 Mon Sep 17 00:00:00 2001 From: Kevin Cunnane Date: Wed, 27 Jul 2016 18:38:18 -0700 Subject: [PATCH 1/4] Add error handling to Connect command - Handles errors when connecting - Adds method to capture the settings so the connection service can use these. Expect to read settings from here (and possible connections) in the future - Minor rename to the test namespace to be consistent with refactor --- .../Connection/ConnectionService.cs | 33 ++++++++++++++++--- src/ServiceHost/Program.cs | 2 +- .../LanguageServer/LanguageServiceTests.cs | 2 +- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/ServiceHost/Connection/ConnectionService.cs b/src/ServiceHost/Connection/ConnectionService.cs index afbf4ab4..32c6c006 100644 --- a/src/ServiceHost/Connection/ConnectionService.cs +++ b/src/ServiceHost/Connection/ConnectionService.cs @@ -10,6 +10,8 @@ using System.Threading.Tasks; using Microsoft.SqlTools.EditorServices.Utility; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; +using Microsoft.SqlTools.ServiceLayer.SqlContext; +using Microsoft.SqlTools.ServiceLayer.WorkspaceServices; namespace Microsoft.SqlTools.ServiceLayer.Connection { @@ -144,12 +146,17 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection { ConnectionId = maxConnectionId }; + + } - public void Initialize(ServiceHost serviceHost) + public void InitializeService(ServiceHost serviceHost) { // Register request and event handlers with the Service Host serviceHost.SetRequestHandler(ConnectionRequest.Type, HandleConnectRequest); + + // Register the configuration update handler + WorkspaceService.Instance.RegisterConfigChangeCallback(HandleDidChangeConfigurationNotification); } /// @@ -177,10 +184,28 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection { Logger.Write(LogLevel.Verbose, "HandleConnectRequest"); - // open connection base on request details - ConnectionResult result = ConnectionService.Instance.Connect(connectionDetails); + try + { + // open connection base on request details + ConnectionResult result = ConnectionService.Instance.Connect(connectionDetails); + await requestContext.SendResult(result); + } + catch(Exception ex) + { + await requestContext.SendError(ex.Message); + } + } - await requestContext.SendResult(result); + #endregion + + #region Handlers for Events from Other Services + + public Task HandleDidChangeConfigurationNotification( + SqlToolsSettings newSettings, + SqlToolsSettings oldSettings, + EventContext eventContext) + { + return Task.FromResult(true); } #endregion diff --git a/src/ServiceHost/Program.cs b/src/ServiceHost/Program.cs index a3f9cf8b..dc77f769 100644 --- a/src/ServiceHost/Program.cs +++ b/src/ServiceHost/Program.cs @@ -45,7 +45,7 @@ namespace Microsoft.SqlTools.ServiceLayer WorkspaceService.Instance.InitializeService(serviceHost); AutoCompleteService.Instance.InitializeService(serviceHost); LanguageService.Instance.InitializeService(serviceHost, sqlToolsContext); - ConnectionService.Instance.Initialize(serviceHost); + ConnectionService.Instance.InitializeService(serviceHost); serviceHost.Initialize(); serviceHost.WaitForExit(); diff --git a/test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs b/test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs index 8f85869d..bab3fa6e 100644 --- a/test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs +++ b/test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; using Microsoft.SqlTools.Test.Utility; using Xunit; -namespace Microsoft.SqlTools.ServiceLayer.Test.LanguageServer +namespace Microsoft.SqlTools.ServiceLayer.Test.LanguageServices { /// /// Tests for the ServiceHost Language Service tests From 5c9c3699b95ca5bb15d4110658ed94102694cc68 Mon Sep 17 00:00:00 2001 From: Kevin Cunnane Date: Thu, 28 Jul 2016 12:52:08 -0700 Subject: [PATCH 2/4] Remove unnecessary whitespace --- src/ServiceHost/Connection/ConnectionService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ServiceHost/Connection/ConnectionService.cs b/src/ServiceHost/Connection/ConnectionService.cs index 32c6c006..577ec559 100644 --- a/src/ServiceHost/Connection/ConnectionService.cs +++ b/src/ServiceHost/Connection/ConnectionService.cs @@ -146,8 +146,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection { ConnectionId = maxConnectionId }; - - } public void InitializeService(ServiceHost serviceHost) From e83d2704b9110f430bc211c78717be474f962981 Mon Sep 17 00:00:00 2001 From: Benjamin Russell Date: Fri, 29 Jul 2016 16:55:44 -0700 Subject: [PATCH 3/4] Fixing project names to fix VS bugs For whatever reason, Visual Studio throws a fit if a referenced project has a name and the folder name (which is used to reference the project) is different than that name. To solve this issue, I've renamed all the projects and folders to match their project names as stated in the project.json. --- sqltoolsservice.sln | 4 ++-- .../Connection/ConnectionMessages.cs | 0 .../Connection/ConnectionService.cs | 0 .../Connection/ISqlConnection.cs | 0 .../Connection/SqlConnection.cs | 0 .../Hosting/Contracts/ClientCapabilities.cs | 0 .../Hosting/Contracts/Initialize.cs | 0 .../Hosting/Contracts/ServerCapabilities.cs | 0 .../Hosting/Contracts/Shutdown.cs | 0 .../Hosting/Protocol/Channel/ChannelBase.cs | 0 .../Hosting/Protocol/Channel/StdioClientChannel.cs | 0 .../Hosting/Protocol/Channel/StdioServerChannel.cs | 0 .../Hosting/Protocol/Constants.cs | 0 .../Hosting/Protocol/Contracts/EventType.cs | 0 .../Hosting/Protocol/Contracts/Message.cs | 0 .../Hosting/Protocol/Contracts/RequestType.cs | 0 .../Hosting/Protocol/EventContext.cs | 0 .../Hosting/Protocol/IMessageSender.cs | 0 .../Hosting/Protocol/MessageDispatcher.cs | 0 .../Hosting/Protocol/MessageParseException.cs | 0 .../Hosting/Protocol/MessageProtocolType.cs | 0 .../Hosting/Protocol/MessageReader.cs | 0 .../Hosting/Protocol/MessageWriter.cs | 0 .../Hosting/Protocol/ProtocolEndpoint.cs | 0 .../Hosting/Protocol/RequestContext.cs | 0 .../Hosting/Protocol/Serializers/IMessageSerializer.cs | 0 .../Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs | 0 .../Hosting/Protocol/Serializers/V8MessageSerializer.cs | 0 .../Hosting/ServiceHost.cs | 0 .../Hosting/ServiceHostBase.cs | 0 .../Hosting/ServiceHostEditorOperations.cs | 0 .../LanguageServices/AutoCompleteService.cs | 0 .../LanguageServices/Contracts/Completion.cs | 0 .../LanguageServices/Contracts/Definition.cs | 0 .../LanguageServices/Contracts/Diagnostics.cs | 0 .../LanguageServices/Contracts/DocumentHighlight.cs | 0 .../LanguageServices/Contracts/ExpandAliasRequest.cs | 0 .../LanguageServices/Contracts/FindModuleRequest.cs | 0 .../LanguageServices/Contracts/Hover.cs | 0 .../LanguageServices/Contracts/InstallModuleRequest.cs | 0 .../LanguageServices/Contracts/References.cs | 0 .../LanguageServices/Contracts/ShowOnlineHelpRequest.cs | 0 .../LanguageServices/Contracts/SignatureHelp.cs | 0 .../LanguageServices/LanguageService.cs | 0 .../Microsoft.SqlTools.ServiceLayer.xproj} | 0 .../Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../SqlContext/HostDetails.cs | 0 .../SqlContext/ProfilePaths.cs | 0 .../SqlContext/SqlToolsContext.cs | 0 .../SqlContext/SqlToolsSettings.cs | 0 .../Utility/AsyncContext.cs | 0 .../Utility/AsyncContextThread.cs | 0 .../Utility/AsyncLock.cs | 0 .../Utility/AsyncQueue.cs | 0 .../Utility/Extensions.cs | 0 .../Utility/Logger.cs | 0 .../Utility/ThreadSynchronizationContext.cs | 0 .../Utility/Validate.cs | 0 .../WorkspaceServices/Contracts/BufferPosition.cs | 0 .../WorkspaceServices/Contracts/BufferRange.cs | 0 .../WorkspaceServices/Contracts/Configuration.cs | 0 .../WorkspaceServices/Contracts/FileChange.cs | 0 .../WorkspaceServices/Contracts/FilePosition.cs | 0 .../WorkspaceServices/Contracts/ScriptFile.cs | 0 .../WorkspaceServices/Contracts/ScriptFileMarker.cs | 0 .../WorkspaceServices/Contracts/ScriptRegion.cs | 0 .../WorkspaceServices/Contracts/TextDocument.cs | 0 .../WorkspaceServices/Contracts/WorkspaceSymbols.cs | 0 .../WorkspaceServices/Workspace.cs | 0 .../WorkspaceServices/WorkspaceService.cs | 0 .../project.json | 2 +- .../App.config | 0 .../Connection/ConnectionServiceTests.cs | 0 .../LanguageServer/LanguageServiceTests.cs | 0 .../Message/MessageReaderWriterTests.cs | 0 .../Message/TestMessageTypes.cs | 0 .../Microsoft.SqlTools.ServiceLayer.Test.xproj} | 0 .../Properties/AssemblyInfo.cs | 0 .../ServiceHost/JsonRpcMessageSerializerTests.cs | 0 .../Utility/TestObjects.cs | 0 .../packages.config | 0 .../project.json | 4 ++-- 83 files changed, 5 insertions(+), 5 deletions(-) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Connection/ConnectionMessages.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Connection/ConnectionService.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Connection/ISqlConnection.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Connection/SqlConnection.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Contracts/ClientCapabilities.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Contracts/Initialize.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Contracts/ServerCapabilities.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Contracts/Shutdown.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Channel/ChannelBase.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Channel/StdioClientChannel.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Channel/StdioServerChannel.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Constants.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Contracts/EventType.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Contracts/Message.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Contracts/RequestType.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/EventContext.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/IMessageSender.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/MessageDispatcher.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/MessageParseException.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/MessageProtocolType.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/MessageReader.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/MessageWriter.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/ProtocolEndpoint.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/RequestContext.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Serializers/IMessageSerializer.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/Protocol/Serializers/V8MessageSerializer.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/ServiceHost.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/ServiceHostBase.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Hosting/ServiceHostEditorOperations.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/AutoCompleteService.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/Completion.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/Definition.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/Diagnostics.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/DocumentHighlight.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/ExpandAliasRequest.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/FindModuleRequest.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/Hover.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/InstallModuleRequest.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/References.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/ShowOnlineHelpRequest.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/Contracts/SignatureHelp.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/LanguageServices/LanguageService.cs (100%) rename src/{ServiceHost/ServiceHost.xproj => Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.xproj} (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Program.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Properties/AssemblyInfo.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/SqlContext/HostDetails.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/SqlContext/ProfilePaths.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/SqlContext/SqlToolsContext.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/SqlContext/SqlToolsSettings.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/AsyncContext.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/AsyncContextThread.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/AsyncLock.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/AsyncQueue.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/Extensions.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/Logger.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/ThreadSynchronizationContext.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/Utility/Validate.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/BufferPosition.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/BufferRange.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/Configuration.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/FileChange.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/FilePosition.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/ScriptFile.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/ScriptFileMarker.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/ScriptRegion.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/TextDocument.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Contracts/WorkspaceSymbols.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/Workspace.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/WorkspaceServices/WorkspaceService.cs (100%) rename src/{ServiceHost => Microsoft.SqlTools.ServiceLayer}/project.json (91%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/App.config (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/Connection/ConnectionServiceTests.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/LanguageServer/LanguageServiceTests.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/Message/MessageReaderWriterTests.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/Message/TestMessageTypes.cs (100%) rename test/{ServiceHost.Test/ServiceHost.Test.xproj => Microsoft.SqlTools.ServiceLayer.Test/Microsoft.SqlTools.ServiceLayer.Test.xproj} (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/Properties/AssemblyInfo.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/ServiceHost/JsonRpcMessageSerializerTests.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/Utility/TestObjects.cs (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/packages.config (100%) rename test/{ServiceHost.Test => Microsoft.SqlTools.ServiceLayer.Test}/project.json (87%) diff --git a/sqltoolsservice.sln b/sqltoolsservice.sln index b993537f..828baca9 100644 --- a/sqltoolsservice.sln +++ b/sqltoolsservice.sln @@ -11,9 +11,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ServiceHost", "src\ServiceHost\ServiceHost.xproj", "{0D61DC2B-DA66-441D-B9D0-F76C98F780F9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.SqlTools.ServiceLayer", "src\Microsoft.SqlTools.ServiceLayer\Microsoft.SqlTools.ServiceLayer.xproj", "{0D61DC2B-DA66-441D-B9D0-F76C98F780F9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ServiceHost.Test", "test\ServiceHost.Test\ServiceHost.Test.xproj", "{2D771D16-9D85-4053-9F79-E2034737DEEF}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.SqlTools.ServiceLayer.Test", "test\Microsoft.SqlTools.ServiceLayer.Test\Microsoft.SqlTools.ServiceLayer.Test.xproj", "{2D771D16-9D85-4053-9F79-E2034737DEEF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ServiceHost/Connection/ConnectionMessages.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionMessages.cs similarity index 100% rename from src/ServiceHost/Connection/ConnectionMessages.cs rename to src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionMessages.cs diff --git a/src/ServiceHost/Connection/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs similarity index 100% rename from src/ServiceHost/Connection/ConnectionService.cs rename to src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs diff --git a/src/ServiceHost/Connection/ISqlConnection.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ISqlConnection.cs similarity index 100% rename from src/ServiceHost/Connection/ISqlConnection.cs rename to src/Microsoft.SqlTools.ServiceLayer/Connection/ISqlConnection.cs diff --git a/src/ServiceHost/Connection/SqlConnection.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/SqlConnection.cs similarity index 100% rename from src/ServiceHost/Connection/SqlConnection.cs rename to src/Microsoft.SqlTools.ServiceLayer/Connection/SqlConnection.cs diff --git a/src/ServiceHost/Hosting/Contracts/ClientCapabilities.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/ClientCapabilities.cs similarity index 100% rename from src/ServiceHost/Hosting/Contracts/ClientCapabilities.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/ClientCapabilities.cs diff --git a/src/ServiceHost/Hosting/Contracts/Initialize.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/Initialize.cs similarity index 100% rename from src/ServiceHost/Hosting/Contracts/Initialize.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/Initialize.cs diff --git a/src/ServiceHost/Hosting/Contracts/ServerCapabilities.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/ServerCapabilities.cs similarity index 100% rename from src/ServiceHost/Hosting/Contracts/ServerCapabilities.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/ServerCapabilities.cs diff --git a/src/ServiceHost/Hosting/Contracts/Shutdown.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/Shutdown.cs similarity index 100% rename from src/ServiceHost/Hosting/Contracts/Shutdown.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Contracts/Shutdown.cs diff --git a/src/ServiceHost/Hosting/Protocol/Channel/ChannelBase.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/ChannelBase.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Channel/ChannelBase.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/ChannelBase.cs diff --git a/src/ServiceHost/Hosting/Protocol/Channel/StdioClientChannel.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/StdioClientChannel.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Channel/StdioClientChannel.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/StdioClientChannel.cs diff --git a/src/ServiceHost/Hosting/Protocol/Channel/StdioServerChannel.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/StdioServerChannel.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Channel/StdioServerChannel.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Channel/StdioServerChannel.cs diff --git a/src/ServiceHost/Hosting/Protocol/Constants.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Constants.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Constants.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Constants.cs diff --git a/src/ServiceHost/Hosting/Protocol/Contracts/EventType.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/EventType.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Contracts/EventType.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/EventType.cs diff --git a/src/ServiceHost/Hosting/Protocol/Contracts/Message.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/Message.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Contracts/Message.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/Message.cs diff --git a/src/ServiceHost/Hosting/Protocol/Contracts/RequestType.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/RequestType.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Contracts/RequestType.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Contracts/RequestType.cs diff --git a/src/ServiceHost/Hosting/Protocol/EventContext.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/EventContext.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/EventContext.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/EventContext.cs diff --git a/src/ServiceHost/Hosting/Protocol/IMessageSender.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/IMessageSender.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/IMessageSender.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/IMessageSender.cs diff --git a/src/ServiceHost/Hosting/Protocol/MessageDispatcher.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/MessageDispatcher.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs diff --git a/src/ServiceHost/Hosting/Protocol/MessageParseException.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageParseException.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/MessageParseException.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageParseException.cs diff --git a/src/ServiceHost/Hosting/Protocol/MessageProtocolType.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageProtocolType.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/MessageProtocolType.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageProtocolType.cs diff --git a/src/ServiceHost/Hosting/Protocol/MessageReader.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageReader.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/MessageReader.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageReader.cs diff --git a/src/ServiceHost/Hosting/Protocol/MessageWriter.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageWriter.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/MessageWriter.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageWriter.cs diff --git a/src/ServiceHost/Hosting/Protocol/ProtocolEndpoint.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/ProtocolEndpoint.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/ProtocolEndpoint.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/ProtocolEndpoint.cs diff --git a/src/ServiceHost/Hosting/Protocol/RequestContext.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/RequestContext.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/RequestContext.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/RequestContext.cs diff --git a/src/ServiceHost/Hosting/Protocol/Serializers/IMessageSerializer.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/IMessageSerializer.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Serializers/IMessageSerializer.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/IMessageSerializer.cs diff --git a/src/ServiceHost/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs diff --git a/src/ServiceHost/Hosting/Protocol/Serializers/V8MessageSerializer.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/V8MessageSerializer.cs similarity index 100% rename from src/ServiceHost/Hosting/Protocol/Serializers/V8MessageSerializer.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/Serializers/V8MessageSerializer.cs diff --git a/src/ServiceHost/Hosting/ServiceHost.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs similarity index 100% rename from src/ServiceHost/Hosting/ServiceHost.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs diff --git a/src/ServiceHost/Hosting/ServiceHostBase.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHostBase.cs similarity index 100% rename from src/ServiceHost/Hosting/ServiceHostBase.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHostBase.cs diff --git a/src/ServiceHost/Hosting/ServiceHostEditorOperations.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHostEditorOperations.cs similarity index 100% rename from src/ServiceHost/Hosting/ServiceHostEditorOperations.cs rename to src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHostEditorOperations.cs diff --git a/src/ServiceHost/LanguageServices/AutoCompleteService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs similarity index 100% rename from src/ServiceHost/LanguageServices/AutoCompleteService.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/Completion.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/Completion.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/Definition.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/Definition.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/Diagnostics.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/Diagnostics.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/DocumentHighlight.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/DocumentHighlight.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/ExpandAliasRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/ExpandAliasRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ExpandAliasRequest.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/FindModuleRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/FindModuleRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/FindModuleRequest.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/Hover.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/Hover.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/InstallModuleRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/InstallModuleRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/InstallModuleRequest.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/References.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/References.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/ShowOnlineHelpRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/ShowOnlineHelpRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/ShowOnlineHelpRequest.cs diff --git a/src/ServiceHost/LanguageServices/Contracts/SignatureHelp.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs similarity index 100% rename from src/ServiceHost/LanguageServices/Contracts/SignatureHelp.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs diff --git a/src/ServiceHost/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs similarity index 100% rename from src/ServiceHost/LanguageServices/LanguageService.cs rename to src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs diff --git a/src/ServiceHost/ServiceHost.xproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.xproj similarity index 100% rename from src/ServiceHost/ServiceHost.xproj rename to src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.xproj diff --git a/src/ServiceHost/Program.cs b/src/Microsoft.SqlTools.ServiceLayer/Program.cs similarity index 100% rename from src/ServiceHost/Program.cs rename to src/Microsoft.SqlTools.ServiceLayer/Program.cs diff --git a/src/ServiceHost/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs similarity index 100% rename from src/ServiceHost/Properties/AssemblyInfo.cs rename to src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs diff --git a/src/ServiceHost/SqlContext/HostDetails.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/HostDetails.cs similarity index 100% rename from src/ServiceHost/SqlContext/HostDetails.cs rename to src/Microsoft.SqlTools.ServiceLayer/SqlContext/HostDetails.cs diff --git a/src/ServiceHost/SqlContext/ProfilePaths.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/ProfilePaths.cs similarity index 100% rename from src/ServiceHost/SqlContext/ProfilePaths.cs rename to src/Microsoft.SqlTools.ServiceLayer/SqlContext/ProfilePaths.cs diff --git a/src/ServiceHost/SqlContext/SqlToolsContext.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsContext.cs similarity index 100% rename from src/ServiceHost/SqlContext/SqlToolsContext.cs rename to src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsContext.cs diff --git a/src/ServiceHost/SqlContext/SqlToolsSettings.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs similarity index 100% rename from src/ServiceHost/SqlContext/SqlToolsSettings.cs rename to src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs diff --git a/src/ServiceHost/Utility/AsyncContext.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncContext.cs similarity index 100% rename from src/ServiceHost/Utility/AsyncContext.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncContext.cs diff --git a/src/ServiceHost/Utility/AsyncContextThread.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncContextThread.cs similarity index 100% rename from src/ServiceHost/Utility/AsyncContextThread.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncContextThread.cs diff --git a/src/ServiceHost/Utility/AsyncLock.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncLock.cs similarity index 100% rename from src/ServiceHost/Utility/AsyncLock.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncLock.cs diff --git a/src/ServiceHost/Utility/AsyncQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncQueue.cs similarity index 100% rename from src/ServiceHost/Utility/AsyncQueue.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/AsyncQueue.cs diff --git a/src/ServiceHost/Utility/Extensions.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/Extensions.cs similarity index 100% rename from src/ServiceHost/Utility/Extensions.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/Extensions.cs diff --git a/src/ServiceHost/Utility/Logger.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs similarity index 100% rename from src/ServiceHost/Utility/Logger.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs diff --git a/src/ServiceHost/Utility/ThreadSynchronizationContext.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/ThreadSynchronizationContext.cs similarity index 100% rename from src/ServiceHost/Utility/ThreadSynchronizationContext.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/ThreadSynchronizationContext.cs diff --git a/src/ServiceHost/Utility/Validate.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/Validate.cs similarity index 100% rename from src/ServiceHost/Utility/Validate.cs rename to src/Microsoft.SqlTools.ServiceLayer/Utility/Validate.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/BufferPosition.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferPosition.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/BufferPosition.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferPosition.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/BufferRange.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferRange.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/BufferRange.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferRange.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/Configuration.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/Configuration.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/Configuration.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/Configuration.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/FileChange.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FileChange.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/FileChange.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FileChange.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/FilePosition.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FilePosition.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/FilePosition.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FilePosition.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/ScriptFile.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFile.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/ScriptFile.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFile.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/ScriptFileMarker.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFileMarker.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/ScriptFileMarker.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFileMarker.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/ScriptRegion.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptRegion.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/ScriptRegion.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptRegion.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/TextDocument.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/TextDocument.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/TextDocument.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/TextDocument.cs diff --git a/src/ServiceHost/WorkspaceServices/Contracts/WorkspaceSymbols.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/WorkspaceSymbols.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Contracts/WorkspaceSymbols.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/WorkspaceSymbols.cs diff --git a/src/ServiceHost/WorkspaceServices/Workspace.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Workspace.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/Workspace.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Workspace.cs diff --git a/src/ServiceHost/WorkspaceServices/WorkspaceService.cs b/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/WorkspaceService.cs similarity index 100% rename from src/ServiceHost/WorkspaceServices/WorkspaceService.cs rename to src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/WorkspaceService.cs diff --git a/src/ServiceHost/project.json b/src/Microsoft.SqlTools.ServiceLayer/project.json similarity index 91% rename from src/ServiceHost/project.json rename to src/Microsoft.SqlTools.ServiceLayer/project.json index bd889b55..b690fd26 100644 --- a/src/ServiceHost/project.json +++ b/src/Microsoft.SqlTools.ServiceLayer/project.json @@ -1,5 +1,5 @@ { - "name": "Microsoft.SqlTools.ServiceHost", + "name": "Microsoft.SqlTools.ServiceLayer", "version": "1.0.0-*", "buildOptions": { "debugType": "portable", diff --git a/test/ServiceHost.Test/App.config b/test/Microsoft.SqlTools.ServiceLayer.Test/App.config similarity index 100% rename from test/ServiceHost.Test/App.config rename to test/Microsoft.SqlTools.ServiceLayer.Test/App.config diff --git a/test/ServiceHost.Test/Connection/ConnectionServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs similarity index 100% rename from test/ServiceHost.Test/Connection/ConnectionServiceTests.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs diff --git a/test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs similarity index 100% rename from test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs diff --git a/test/ServiceHost.Test/Message/MessageReaderWriterTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Message/MessageReaderWriterTests.cs similarity index 100% rename from test/ServiceHost.Test/Message/MessageReaderWriterTests.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/Message/MessageReaderWriterTests.cs diff --git a/test/ServiceHost.Test/Message/TestMessageTypes.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Message/TestMessageTypes.cs similarity index 100% rename from test/ServiceHost.Test/Message/TestMessageTypes.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/Message/TestMessageTypes.cs diff --git a/test/ServiceHost.Test/ServiceHost.Test.xproj b/test/Microsoft.SqlTools.ServiceLayer.Test/Microsoft.SqlTools.ServiceLayer.Test.xproj similarity index 100% rename from test/ServiceHost.Test/ServiceHost.Test.xproj rename to test/Microsoft.SqlTools.ServiceLayer.Test/Microsoft.SqlTools.ServiceLayer.Test.xproj diff --git a/test/ServiceHost.Test/Properties/AssemblyInfo.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Properties/AssemblyInfo.cs similarity index 100% rename from test/ServiceHost.Test/Properties/AssemblyInfo.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/Properties/AssemblyInfo.cs diff --git a/test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/ServiceHost/JsonRpcMessageSerializerTests.cs similarity index 100% rename from test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/ServiceHost/JsonRpcMessageSerializerTests.cs diff --git a/test/ServiceHost.Test/Utility/TestObjects.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs similarity index 100% rename from test/ServiceHost.Test/Utility/TestObjects.cs rename to test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs diff --git a/test/ServiceHost.Test/packages.config b/test/Microsoft.SqlTools.ServiceLayer.Test/packages.config similarity index 100% rename from test/ServiceHost.Test/packages.config rename to test/Microsoft.SqlTools.ServiceLayer.Test/packages.config diff --git a/test/ServiceHost.Test/project.json b/test/Microsoft.SqlTools.ServiceLayer.Test/project.json similarity index 87% rename from test/ServiceHost.Test/project.json rename to test/Microsoft.SqlTools.ServiceLayer.Test/project.json index a32fe523..792ec095 100644 --- a/test/ServiceHost.Test/project.json +++ b/test/Microsoft.SqlTools.ServiceLayer.Test/project.json @@ -1,5 +1,5 @@ { - "name": "Microsoft.SqlTools.ServiceHost.Test", + "name": "Microsoft.SqlTools.ServiceLayer.Test", "version": "1.0.0-*", "buildOptions": { "debugType": "portable" @@ -11,7 +11,7 @@ "System.Data.SqlClient": "4.1.0", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "ServiceHost": { + "Microsoft.SqlTools.ServiceLayer": { "target": "project" } }, From d53c0d3f45c43643e12fde2b0e6f60c1cfc92db0 Mon Sep 17 00:00:00 2001 From: Benjamin Russell Date: Fri, 29 Jul 2016 17:14:40 -0700 Subject: [PATCH 4/4] Correcting InternalsVisibleTo attribute --- src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs index ee34cfc1..33b9e4a8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs @@ -41,4 +41,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyInformationalVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceHost.Test")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test")]