From 99ab6406d21263b4a90d80bafc0eec43e204bb68 Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Fri, 26 Aug 2016 10:15:23 -0700
Subject: [PATCH] Integrate SMO .Net core into SQL Tools Service project

---
 .../LanguageServices/IntellisenseCache.cs                 | 8 ++++----
 .../LanguageServices/LanguageService.cs                   | 1 +
 src/Microsoft.SqlTools.ServiceLayer/project.json          | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/IntellisenseCache.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/IntellisenseCache.cs
index 51e1a1b7..3fa1ed29 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/IntellisenseCache.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/IntellisenseCache.cs
@@ -75,16 +75,16 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
             // Take a reference to the list at a point in time in case we update and replace the list
             //var suggestions = AutoCompleteList;
-            if (!LanguageService.Instance.ScriptParseInfoMap.ContainsKey(textDocumentPosition.Uri))
+            if (!LanguageService.Instance.ScriptParseInfoMap.ContainsKey(textDocumentPosition.TextDocument.Uri))
             {
                 return completions;
             }
 
-            var scriptParseInfo = LanguageService.Instance.ScriptParseInfoMap[textDocumentPosition.Uri];
+            var scriptParseInfo = LanguageService.Instance.ScriptParseInfoMap[textDocumentPosition.TextDocument.Uri];
             var suggestions = Resolver.FindCompletions(
                 scriptParseInfo.ParseResult, 
-                textDocumentPosition.Position.Line, 
-                textDocumentPosition.Position.Character, 
+                textDocumentPosition.Position.Line + 1, 
+                textDocumentPosition.Position.Character + 1, 
                 scriptParseInfo.MetadataDisplayInfoProvider); 
 
             int i = 0;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
index 3dad024f..611e8c81 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
@@ -173,6 +173,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                 }
 
                 ScriptParseInfo parseInfo = this.ScriptParseInfoMap[scriptFile.ClientFilePath];
+                parseInfo.ParseResult = parseResult;
                 List<ParseResult> parseResults = new List<ParseResult>();
                 parseResults.Add(parseResult);
                 parseInfo.Binder.Bind(
diff --git a/src/Microsoft.SqlTools.ServiceLayer/project.json b/src/Microsoft.SqlTools.ServiceLayer/project.json
index 3f656a75..a0a73439 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/project.json
+++ b/src/Microsoft.SqlTools.ServiceLayer/project.json
@@ -10,10 +10,11 @@
     "Microsoft.SqlServer.SqlParser": "140.1.5",
     "System.Data.Common": "4.1.0",
     "System.Data.SqlClient": "4.1.0",
-    "Microsoft.SqlServer.Smo": "140.1.2",
+    "Microsoft.SqlServer.Smo": "140.1.5",
     "System.Security.SecureString": "4.0.0",
     "System.Collections.Specialized": "4.0.1",
-    "System.ComponentModel.TypeConverter": "4.1.0"
+    "System.ComponentModel.TypeConverter": "4.1.0",    
+    "System.Diagnostics.TraceSource": "4.0.0"
   },
   "frameworks": {
     "netcoreapp1.0": {