Merge branch 'dev' into feature/queryBatchProcessing

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs

@@ -124,6 +124,9 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
 
                             // Add the result set to the results of the query
                             ResultSets.Add(resultSet);
+
+                            // Add a message for the number of rows the query returned
+                            ResultMessages.Add(string.Format(RowsAffectedFormat, resultSet.Rows.Count));
                         } while (await reader.NextResultAsync(cancellationToken));
                     }
                 }

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs

@@ -21,6 +21,8 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
     /// </summary>
     public class Query : IDisposable
     {
+        private const string RowsAffectedFormat = "({0} row(s) affected)";
+
         #region Properties
 
         /// <summary>

src/Microsoft.SqlTools.ServiceLayer/project.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "Newtonsoft.Json": "9.0.1",
-    "Microsoft.SqlServer.SqlParser": "140.1.3",
+    "Microsoft.SqlServer.SqlParser": "140.1.4",
     "System.Data.Common": "4.1.0",
     "System.Data.SqlClient": "4.1.0"
   },