Revert to SMO with older SQLClient driver (#889)

* Revert "Update SMO (#875)"

This reverts commit 96593d66e3.

* Revert "Switch Tools Service to new SMO and Microsoft.Data.SqlClient driver (#865)"

This reverts commit 9d140b53f3.

* Bump SMO to 160.1910315.0-preview
This commit is contained in:
Karl Burtram
2019-11-04 13:00:45 -08:00
committed by GitHub
parent 84c505f647
commit b763abae47
130 changed files with 160 additions and 135 deletions

View File

@@ -78,7 +78,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Cms
RegisteredServerName = name,
RegisteredServerDescription = "My Registered Test Server",
ParentOwnerUri = connectParams.OwnerUri,
RegisteredServerConnectionDetails = new ConnectionDetails { ServerName = name},
RelativePath = "RegisteredServersStore/ServerGroup[@Name='DatabaseEngineServerGroup']" //Top level
};

View File

@@ -7,7 +7,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.Threading;
using Microsoft.SqlTools.ServiceLayer.Connection;
using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;

View File

@@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.IO;
using System.Threading.Tasks;
using Microsoft.SqlServer.Management.Smo;

View File

@@ -4,7 +4,7 @@
//
using System;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.IO;
using Microsoft.SqlTools.ServiceLayer.Admin;
using Microsoft.SqlTools.ServiceLayer.Connection;

View File

@@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.Globalization;
using System.IO;
using System.Linq;

View File

@@ -13,7 +13,7 @@ using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
using Moq;
using System;
using System.Collections.Generic;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;

View File

@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Common.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -33,6 +34,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="$(SmoPackageVersion)" />
<PackageReference Include="Microsoft.SqlServer.DacFx" Version="150.4576.1-preview" />
</ItemGroup>
<ItemGroup>

View File

@@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.IO;
using System.Threading;
using System.Threading.Tasks;

View File

@@ -12,7 +12,7 @@ using Microsoft.SqlTools.ServiceLayer.Test.Common;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Moq;
using System;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Threading.Tasks;

View File

@@ -4,7 +4,7 @@
//
using System.Data.Common;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.SqlServer.Management.Common;

View File

@@ -1,5 +1,5 @@
using System;
using Microsoft.Data.SqlClient;
using System.Data.SqlClient;
using System.Globalization;
using System.IO;
using System.Reflection;