diff --git a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.3.nupkg b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.3.nupkg
deleted file mode 100644
index 6a79d110..00000000
Binary files a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.3.nupkg and /dev/null differ
diff --git a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.4.nupkg b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.4.nupkg
new file mode 100644
index 00000000..059a6577
Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.2.4.nupkg differ
diff --git a/bin/nuget/Microsoft.SqlServer.Smo.140.2.3.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.140.2.3.nupkg
deleted file mode 100644
index bdc50c9e..00000000
Binary files a/bin/nuget/Microsoft.SqlServer.Smo.140.2.3.nupkg and /dev/null differ
diff --git a/bin/nuget/Microsoft.SqlServer.Smo.140.2.4.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.140.2.4.nupkg
new file mode 100644
index 00000000..6f11b8bd
Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Smo.140.2.4.nupkg differ
diff --git a/docs/samples/smo/netcore/ModifySetting/Program.cs b/docs/samples/smo/netcore/ModifySetting/Program.cs
index 4104c90c..b5e6294f 100644
--- a/docs/samples/smo/netcore/ModifySetting/Program.cs
+++ b/docs/samples/smo/netcore/ModifySetting/Program.cs
@@ -1,4 +1,4 @@
-using Microsoft.Data.Tools.DataSets;
+
using Microsoft.SqlServer.Management.Smo;
using System;
diff --git a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
index 1b398b26..63839945 100644
--- a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
+++ b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
@@ -18,13 +18,13 @@
-
-
-
+
+
+
-
+
-
+
diff --git a/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj b/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj
index 382d7e97..8cc08212 100644
--- a/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj
+++ b/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj
@@ -13,13 +13,13 @@
win7-x64;win7-x86;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64
-
-
-
+
+
+
-
+
-
+
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/BrowseFolderHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/BrowseFolderHelper.cs
index 894ffc0e..574d882a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/BrowseFolderHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/BrowseFolderHelper.cs
@@ -13,7 +13,6 @@ using Microsoft.SqlServer.Management.Sdk.Sfc;
using Microsoft.SqlServer.Management.Smo;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.Data.Tools.DataSets;
namespace Microsoft.SqlTools.ServiceLayer.Admin
{
@@ -50,7 +49,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin
Request request = new Request();
request.Urn = "Server/Database[@Name='model']/FileGroup[@Name='PRIMARY']/File";
request.Fields = new string[1] {"FileName"};
- Microsoft.Data.Tools.DataSets.DataSet dataSet = enumerator.Process(serverConnection, request);
+ DataSet dataSet = enumerator.Process(serverConnection, request);
if (0 < dataSet.Tables[0].Rows.Count)
{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/DataContainer.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/DataContainer.cs
index 455b5d20..7528e79f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/DataContainer.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Common/DataContainer.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
+using System.Data;
using System.Globalization;
using System.IO;
using System.Reflection;
@@ -18,7 +19,6 @@ using Microsoft.SqlServer.Management.Sdk.Sfc;
using Microsoft.SqlServer.Management.Smo;
using Assembly = System.Reflection.Assembly;
using System.Xml.Linq;
-using Microsoft.Data.Tools.DataSets;
namespace Microsoft.SqlTools.ServiceLayer.Admin
{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
index 3572eb0d..73d24c0d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
@@ -20,8 +20,6 @@ using System.Globalization;
using System.Data.SqlClient;
using System.Collections.Generic;
using AzureEdition = Microsoft.SqlTools.ServiceLayer.Admin.AzureSqlDbHelper.AzureEdition;
-using DataSet = Microsoft.Data.Tools.DataSets.DataSet;
-using DataTable = Microsoft.Data.Tools.DataSets.DataTable;
namespace Microsoft.SqlTools.ServiceLayer.Admin
{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
index fe7fa776..c7e2bfc4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
@@ -6,6 +6,7 @@
using System;
using System.Collections.Specialized;
using System.ComponentModel;
+using System.Data;
using System.Resources;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.Smo;
@@ -16,7 +17,6 @@ using System.Data.SqlClient;
using System.Collections.Generic;
using System.Diagnostics;
using AzureEdition = Microsoft.SqlTools.ServiceLayer.Admin.AzureSqlDbHelper.AzureEdition;
-using Microsoft.Data.Tools.DataSets;
namespace Microsoft.SqlTools.ServiceLayer.Admin
{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
index 8c2a3c59..dae69d45 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
@@ -6,8 +6,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Data;
using System.Data.SqlClient;
-using Microsoft.Data.Tools.DataSets;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.Sdk.Sfc;
using Microsoft.SqlServer.Management.Smo;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
index 18b93b49..564fb6b8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
@@ -5,7 +5,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using Microsoft.Data.Tools.DataSets;
+using System.Data;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.Sdk.Sfc;
using Microsoft.SqlServer.Management.Smo;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreUtil.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreUtil.cs
index e3972342..86e3b30d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreUtil.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreUtil.cs
@@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
-using Microsoft.Data.Tools.DataSets;
+using System.Data;
using Microsoft.SqlServer.Management.Sdk.Sfc;
using Microsoft.SqlServer.Management.Smo;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
index 38a65768..abbd2aca 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
+++ b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs
index b16d3fd9..038eb201 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using Microsoft.Data.Tools.DataSets;
using Microsoft.SqlServer.Management.Smo;
using Microsoft.SqlTools.Extensibility;
@@ -52,14 +51,14 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
reader = data as IDataReader;
}
- else if(data is Data.Tools.DataSets.DataTable)
+ else if(data is DataTable)
{
- reader = ((Data.Tools.DataSets.DataTable)data).CreateDataReader();
+ reader = ((DataTable)data).CreateDataReader();
}
- else if (data is Microsoft.Data.Tools.DataSets.DataSet)
+ else if (data is DataSet)
{
- reader = ((Microsoft.Data.Tools.DataSets.DataSet)data).Tables[0].CreateDataReader();
+ reader = ((DataSet)data).Tables[0].CreateDataReader();
}
return reader;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
index 9fcd5721..4ed1c8bb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
@@ -27,11 +27,11 @@
-
+
-
-
+
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
index 7238ba8d..eab6a60c 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj
index 901a7257..4babb0fd 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj
@@ -8,11 +8,11 @@
false
-
+
-
-
+
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj
index 25fdfba4..3562a329 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj
index daa473c7..dded9854 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj
@@ -8,12 +8,12 @@
false
-
+
-
-
-
+
+
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
index c346b4cb..a990e2da 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
@@ -9,11 +9,11 @@
-
+
-
-
+
+