diff --git a/.gitignore b/.gitignore
index d1fcfc4e..4c997e2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,270 @@
-bin
-obj
-project.lock.json
\ No newline at end of file
+syntax: glob
+
+### VisualStudio ###
+
+# Project.json lock file
+project.lock.json
+
+# Tool Runtime Dir
+/[Tt]ools/
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+msbuild.log
+msbuild.err
+msbuild.wrn
+
+
+
+# Cross building rootfs
+cross/rootfs/
+
+# Visual Studio 2015
+.vs/
+
+# Visual Studio 2015 Pre-CTP6
+*.sln.ide
+*.ide/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nuget.props
+*.nuget.targets
+*.nupkg
+**/packages/*
+
+# NuGet package restore lockfiles
+project.lock.json
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+*.metaproj
+*.metaproj.tmp
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+### MonoDevelop ###
+
+*.pidb
+*.userprefs
+
+### Windows ###
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### Linux ###
+
+*~
+
+# KDE directory preferences
+.directory
+
+### OSX ###
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# vim temporary files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+
+# Visual Studio Code
+.vscode/
diff --git a/ServiceHost/.vscode/launch.json b/ServiceHost/.vscode/launch.json
deleted file mode 100644
index 18ebbb27..00000000
--- a/ServiceHost/.vscode/launch.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "version": "0.2.0",
- "configurations": [
- {
- "name": ".NET Core Launch (console)",
- "type": "coreclr",
- "request": "launch",
- "preLaunchTask": "build",
- "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/servicehost.dll",
- "args": [],
- "cwd": "${workspaceRoot}",
- "externalConsole": true,
- "requireExactSource": false,
- "stopAtEntry": false
- },
- {
- "name": ".NET Core Attach",
- "type": "coreclr",
- "request": "attach",
- "requireExactSource": false,
- "processId": 17264
- }
- ]
-}
\ No newline at end of file
diff --git a/ServiceHost/.vscode/tasks.json b/ServiceHost/.vscode/tasks.json
deleted file mode 100644
index 67d6eb75..00000000
--- a/ServiceHost/.vscode/tasks.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "version": "0.1.0",
- "command": "dotnet",
- "isShellCommand": true,
- "args": [],
- "tasks": [
- {
- "taskName": "build",
- "args": [],
- "isBuildCommand": true,
- "problemMatcher": "$msCompile"
- }
- ]
-}
\ No newline at end of file
diff --git a/ServiceHost/LanguageServer/ClientCapabilities.cs b/ServiceHost/LanguageServer/ClientCapabilities.cs
deleted file mode 100644
index 70e2d068..00000000
--- a/ServiceHost/LanguageServer/ClientCapabilities.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// 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.EditorServices.Protocol.LanguageServer
-{
- ///
- /// Defines a class that describes the capabilities of a language
- /// client. At this time no specific capabilities are listed for
- /// clients.
- ///
- public class ClientCapabilities
- {
- }
-}
-
diff --git a/ServiceHost/LanguageServer/Completion.cs b/ServiceHost/LanguageServer/Completion.cs
deleted file mode 100644
index 5f26ea96..00000000
--- a/ServiceHost/LanguageServer/Completion.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System.Diagnostics;
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class CompletionRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("textDocument/completion");
- }
-
- public class CompletionResolveRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("completionItem/resolve");
- }
-
- public enum CompletionItemKind
- {
- Text = 1,
- Method = 2,
- Function = 3,
- Constructor = 4,
- Field = 5,
- Variable = 6,
- Class = 7,
- Interface = 8,
- Module = 9,
- Property = 10,
- Unit = 11,
- Value = 12,
- Enum = 13,
- Keyword = 14,
- Snippet = 15,
- Color = 16,
- File = 17,
- Reference = 18
- }
-
- [DebuggerDisplay("NewText = {NewText}, Range = {Range.Start.Line}:{Range.Start.Character} - {Range.End.Line}:{Range.End.Character}")]
- public class TextEdit
- {
- public Range Range { get; set; }
-
- public string NewText { get; set; }
- }
-
- [DebuggerDisplay("Kind = {Kind.ToString()}, Label = {Label}, Detail = {Detail}")]
- public class CompletionItem
- {
- public string Label { get; set; }
-
- public CompletionItemKind? Kind { get; set; }
-
- public string Detail { get; set; }
-
- ///
- /// Gets or sets the documentation string for the completion item.
- ///
- public string Documentation { get; set; }
-
- public string SortText { get; set; }
-
- public string FilterText { get; set; }
-
- public string InsertText { get; set; }
-
- public TextEdit TextEdit { get; set; }
-
- ///
- /// Gets or sets a custom data field that allows the server to mark
- /// each completion item with an identifier that will help correlate
- /// the item to the previous completion request during a completion
- /// resolve request.
- ///
- public object Data { get; set; }
- }
-}
diff --git a/ServiceHost/LanguageServer/Configuration.cs b/ServiceHost/LanguageServer/Configuration.cs
deleted file mode 100644
index b9ad87db..00000000
--- a/ServiceHost/LanguageServer/Configuration.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class DidChangeConfigurationNotification
- {
- public static readonly
- EventType> Type =
- EventType>.Create("workspace/didChangeConfiguration");
- }
-
- public class DidChangeConfigurationParams
- {
- public TConfig Settings { get; set; }
- }
-}
diff --git a/ServiceHost/LanguageServer/Definition.cs b/ServiceHost/LanguageServer/Definition.cs
deleted file mode 100644
index b18845c3..00000000
--- a/ServiceHost/LanguageServer/Definition.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class DefinitionRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("textDocument/definition");
- }
-}
-
diff --git a/ServiceHost/LanguageServer/Diagnostics.cs b/ServiceHost/LanguageServer/Diagnostics.cs
deleted file mode 100644
index a5472607..00000000
--- a/ServiceHost/LanguageServer/Diagnostics.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class PublishDiagnosticsNotification
- {
- public static readonly
- EventType Type =
- EventType.Create("textDocument/publishDiagnostics");
-
- ///
- /// Gets or sets the URI for which diagnostic information is reported.
- ///
- public string Uri { get; set; }
-
- ///
- /// Gets or sets the array of diagnostic information items.
- ///
- public Diagnostic[] Diagnostics { get; set; }
- }
-
- public enum DiagnosticSeverity
- {
- ///
- /// Indicates that the diagnostic represents an error.
- ///
- Error = 1,
-
- ///
- /// Indicates that the diagnostic represents a warning.
- ///
- Warning = 2,
-
- ///
- /// Indicates that the diagnostic represents an informational message.
- ///
- Information = 3,
-
- ///
- /// Indicates that the diagnostic represents a hint.
- ///
- Hint = 4
- }
-
- public class Diagnostic
- {
- public Range Range { get; set; }
-
- ///
- /// Gets or sets the severity of the diagnostic. If omitted, the
- /// client should interpret the severity.
- ///
- public DiagnosticSeverity? Severity { get; set; }
-
- ///
- /// Gets or sets the diagnostic's code (optional).
- ///
- public string Code { get; set; }
-
- ///
- /// Gets or sets the diagnostic message.
- ///
- public string Message { get; set; }
- }
-}
-
diff --git a/ServiceHost/LanguageServer/DocumentHighlight.cs b/ServiceHost/LanguageServer/DocumentHighlight.cs
deleted file mode 100644
index 6849ddfb..00000000
--- a/ServiceHost/LanguageServer/DocumentHighlight.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public enum DocumentHighlightKind
- {
- Text = 1,
- Read = 2,
- Write = 3
- }
-
- public class DocumentHighlight
- {
- public Range Range { get; set; }
-
- public DocumentHighlightKind Kind { get; set; }
- }
-
- public class DocumentHighlightRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("textDocument/documentHighlight");
- }
-}
-
diff --git a/ServiceHost/LanguageServer/ExpandAliasRequest.cs b/ServiceHost/LanguageServer/ExpandAliasRequest.cs
deleted file mode 100644
index d7f9fde4..00000000
--- a/ServiceHost/LanguageServer/ExpandAliasRequest.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class ExpandAliasRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("SqlTools/expandAlias");
- }
-}
diff --git a/ServiceHost/LanguageServer/FindModuleRequest.cs b/ServiceHost/LanguageServer/FindModuleRequest.cs
deleted file mode 100644
index ab78a158..00000000
--- a/ServiceHost/LanguageServer/FindModuleRequest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-using System.Collections.Generic;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class FindModuleRequest
- {
- public static readonly
- RequestType, object> Type =
- RequestType, object>.Create("SqlTools/findModule");
- }
-
-
- public class PSModuleMessage
- {
- public string Name { get; set; }
- public string Description { get; set; }
- }
-}
diff --git a/ServiceHost/LanguageServer/Hover.cs b/ServiceHost/LanguageServer/Hover.cs
deleted file mode 100644
index 2e196fba..00000000
--- a/ServiceHost/LanguageServer/Hover.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class MarkedString
- {
- public string Language { get; set; }
-
- public string Value { get; set; }
- }
-
- public class Hover
- {
- public MarkedString[] Contents { get; set; }
-
- public Range? Range { get; set; }
- }
-
- public class HoverRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("textDocument/hover");
-
- }
-}
-
diff --git a/ServiceHost/LanguageServer/Initialize.cs b/ServiceHost/LanguageServer/Initialize.cs
deleted file mode 100644
index 7551835e..00000000
--- a/ServiceHost/LanguageServer/Initialize.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class InitializeRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("initialize");
-
- ///
- /// Gets or sets the root path of the editor's open workspace.
- /// If null it is assumed that a file was opened without having
- /// a workspace open.
- ///
- public string RootPath { get; set; }
-
- ///
- /// Gets or sets the capabilities provided by the client (editor).
- ///
- public ClientCapabilities Capabilities { get; set; }
- }
-
- public class InitializeResult
- {
- ///
- /// Gets or sets the capabilities provided by the language server.
- ///
- public ServerCapabilities Capabilities { get; set; }
- }
-
- public class InitializeError
- {
- ///
- /// Gets or sets a boolean indicating whether the client should retry
- /// sending the Initialize request after showing the error to the user.
- ///
- public bool Retry { get; set;}
- }
-}
-
diff --git a/ServiceHost/LanguageServer/InstallModuleRequest.cs b/ServiceHost/LanguageServer/InstallModuleRequest.cs
deleted file mode 100644
index b03b8864..00000000
--- a/ServiceHost/LanguageServer/InstallModuleRequest.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- class InstallModuleRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("SqlTools/installModule");
- }
-}
diff --git a/ServiceHost/LanguageServer/References.cs b/ServiceHost/LanguageServer/References.cs
deleted file mode 100644
index 25a92b12..00000000
--- a/ServiceHost/LanguageServer/References.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class ReferencesRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("textDocument/references");
- }
-
- public class ReferencesParams : TextDocumentPosition
- {
- public ReferencesContext Context { get; set; }
- }
-
- public class ReferencesContext
- {
- public bool IncludeDeclaration { get; set; }
- }
-}
-
diff --git a/ServiceHost/LanguageServer/ServerCapabilities.cs b/ServiceHost/LanguageServer/ServerCapabilities.cs
deleted file mode 100644
index 2f7404d9..00000000
--- a/ServiceHost/LanguageServer/ServerCapabilities.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// 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.EditorServices.Protocol.LanguageServer
-{
- public class ServerCapabilities
- {
- public TextDocumentSyncKind? TextDocumentSync { get; set; }
-
- public bool? HoverProvider { get; set; }
-
- public CompletionOptions CompletionProvider { get; set; }
-
- public SignatureHelpOptions SignatureHelpProvider { get; set; }
-
- public bool? DefinitionProvider { get; set; }
-
- public bool? ReferencesProvider { get; set; }
-
- public bool? DocumentHighlightProvider { get; set; }
-
- public bool? DocumentSymbolProvider { get; set; }
-
- public bool? WorkspaceSymbolProvider { get; set; }
- }
-
- ///
- /// Defines the document synchronization strategies that a server may support.
- ///
- public enum TextDocumentSyncKind
- {
- ///
- /// Indicates that documents should not be synced at all.
- ///
- None = 0,
-
- ///
- /// Indicates that document changes are always sent with the full content.
- ///
- Full,
-
- ///
- /// Indicates that document changes are sent as incremental changes after
- /// the initial document content has been sent.
- ///
- Incremental
- }
-
- public class CompletionOptions
- {
- public bool? ResolveProvider { get; set; }
-
- public string[] TriggerCharacters { get; set; }
- }
-
- public class SignatureHelpOptions
- {
- public string[] TriggerCharacters { get; set; }
- }
-}
-
diff --git a/ServiceHost/LanguageServer/ShowOnlineHelpRequest.cs b/ServiceHost/LanguageServer/ShowOnlineHelpRequest.cs
deleted file mode 100644
index 8f21fb1b..00000000
--- a/ServiceHost/LanguageServer/ShowOnlineHelpRequest.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- public class ShowOnlineHelpRequest
- {
- public static readonly
- RequestType Type =
- RequestType.Create("SqlTools/showOnlineHelp");
- }
-}
diff --git a/ServiceHost/LanguageServer/Shutdown.cs b/ServiceHost/LanguageServer/Shutdown.cs
deleted file mode 100644
index f0a7bbd2..00000000
--- a/ServiceHost/LanguageServer/Shutdown.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
-
-namespace Microsoft.SqlTools.EditorServices.Protocol.LanguageServer
-{
- ///
- /// Defines a message that is sent from the client to request
- /// that the server shut down.
- ///
- public class ShutdownRequest
- {
- public static readonly
- RequestType