Merge branch 'dev' into dev_langservice

test/ServiceHost.Test/Connection/ConnectionServiceTests.cs

@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-#define USE_LIVE_CONNECTION
-
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Test.Utility;
 using Xunit;
@@ -51,8 +49,7 @@ namespace Microsoft.SqlTools.Test.Connection
             );
             
             // connect to a database instance 
-            var connectionResult = TestObjects.GetTestConnectionService()
-                .Connect(TestObjects.GetTestConnectionDetails());
+            var connectionResult = connectionService.Connect(TestObjects.GetTestConnectionDetails());
 
             // verify that a valid connection id was returned
             Assert.True(callbackInvoked);

test/ServiceHost.Test/Message/TestMessageTypes.cs

@@ -4,6 +4,7 @@
 //
 
 using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
+using System;
 using System.Threading.Tasks;
 
 namespace Microsoft.SqlTools.EditorServices.Test.Protocol.MessageProtocol

test/ServiceHost.Test/ServiceHost.Test.xproj

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2d771d16-9d85-4053-9f79-e2034737deef</ProjectGuid>
+    <RootNamespace>Microsoft.SqlTools.EditorServices.Test.Protocol</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

test/ServiceHost.Test/project.json

@@ -11,7 +11,7 @@
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-192208-24",
     "ServiceHost": {
-		  "target": "project"
+       "target": "project"
     }
   },
   "testRunner": "xunit",