ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-24 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to SMO built with .Net 2.0 RTM SDK (#437)

Browse Source 
* Pick up .Net 2 RTM SMO dependencies

* Add missing NUPKG files

* Remove preview framework nuget packages
This commit is contained in:
Karl Burtram
2017-08-16 16:08:03 -07:00
committed by GitHub
parent 236844958e
commit 4e9ff42dfc
22 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.SqlTools.ServiceLayer/Admin/Common/BrowseFolderHelper.cs
View File

@@ -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)
{

2
src/Microsoft.SqlTools.ServiceLayer/Admin/Common/DataContainer.cs
View File

@@ -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
{

2
src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
View File

@@ -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
{

2
src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
View File

@@ -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
{

2
src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
View File

@@ -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;

2
src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
View File

@@ -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;

2
src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreUtil.cs
View File

@@ -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;

6
src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
View File

@@ -18,9 +18,9 @@
<Reference Include="System.Data.SqlClient" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview1-25305-02" />
<PackageReference Include="Microsoft.SqlServer.Smo" Version="140.2.3" />
<PackageReference Include="Microsoft.SqlServer.Management.SqlScriptPublishModel" Version="140.2.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
<PackageReference Include="Microsoft.SqlServer.Smo" Version="140.2.4" />
<PackageReference Include="Microsoft.SqlServer.Management.SqlScriptPublishModel" Version="140.2.4" />
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs" />

9
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQuerier.cs
View File

@@ -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;