Creating a new Sql Core project that stores OE classes. (#2165)

* init * More fixes * moving filters from contracts to core OE classes * Fixing some tests * More fixes and added doc comments * Fixing tests * Quick refactoring * more cleanups * cleanup * Adding stateless OE * Adding null checks * Making group by schema independent of settings * Fixing tests * Removing node info from core oe code * Fixing tests and moving OE code to its own project * moving oe to own project * Removing changes to Kusto * Removing azure access token from service layer * Fixing project description and title * Fixing file name typo * Removing unused strings from service layer * Fixing localized strings in tests Adding comments to stateless OE * Fixing stuff * Update src/Microsoft.SqlTools.SqlCore/Microsoft.SqlTools.SqlCore.csproj Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> * Fixing project nesting * Fixing more stuff and removing OE class * Cleanup * Code cleanup * fixing oe service provider * Fixing test name * Remove using * Update src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoQueryContext.cs Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> * Fixing syntax error * Adding project to locproject * Fixing stuff * Fixing errors * sorting usings --------- Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>
2026-01-14 01:25:40 -05:00 · 2023-08-17 05:11:35 +00:00
parent 4ae9534ac8
commit 73c2a75fba
98 changed files with 6755 additions and 6116 deletions
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/GroupBySchemaTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/GroupBySchemaTests.cs
@@ -4,13 +4,17 @@
 //
 using System;
 using System.Linq;
+
 using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.Extensibility;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Workspace;
+
 using Moq;
+
 using NUnit.Framework;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
@@ -19,23 +23,31 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
    {
        Mock<DatabaseChildFactory> factory;
        Mock<TreeNode> node;
+        Mock<SmoQueryContext> context;
+        bool enableGroupBySchema = false;
+

        [SetUp]
        public void init()
        {
            factory = new Mock<DatabaseChildFactory>();
            factory.SetupGet(c => c.ChildQuerierTypes).Returns(null as Type[]);
-            factory.Setup(c => c.CreateChild(It.IsAny<TreeNode>(), It.IsAny<SqlSmoObject>())).Returns((TreeNode node, Schema obj) => {
-                return new TreeNode(){
+            factory.Setup(c => c.CreateChild(It.IsAny<TreeNode>(), It.IsAny<SqlSmoObject>())).Returns((TreeNode node, Schema obj) =>
+            {
+                return new TreeNode()
+                {
                    Label = obj.Name,
                    NodeType = nameof(NodeTypes.Schemas)
                };
            });
            factory.CallBase = true;
-            Mock<SmoQueryContext> context = new Mock<SmoQueryContext>(new Server(), null);
+            context = new Mock<SmoQueryContext>(new Server(), ExtensionServiceProvider.CreateDefaultServiceProvider(), () =>
+            {
+                return enableGroupBySchema;
+            });
            context.CallBase = true;
            context.Object.ValidFor = ValidForFlag.None;
-            
+
            node = new Mock<TreeNode>();
            node.Setup(n => n.GetContext()).Returns(context.Object);
        }
@@ -43,7 +55,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        [Test]
        public void SchemaBasedFoldersExcludedWhenGroupBySchemaIsEnabled()
        {
-            WorkspaceService<SqlToolsSettings>.Instance.CurrentSettings.SqlTools.ObjectExplorer = new ObjectExplorerSettings() { GroupBySchema = true };
+            enableGroupBySchema = true;
            var children = factory.Object.Expand(node.Object, true, "TestDB", true, new System.Threading.CancellationToken());
            Assert.False(children.Any(c => c.Label == "Tables"), "Tables subfolder in database should be excluded when group by schema is enabled");
            Assert.False(children.Any(c => c.Label == "Views"), "Views subfolder in database should be excluded when group by schema is enabled");
@@ -53,6 +65,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        [Test]
        public void SchemaBasedFoldersIncludedWhenGroupBySchemaIsDisabled()
        {
+            enableGroupBySchema = false;
            WorkspaceService<SqlToolsSettings>.Instance.CurrentSettings.SqlTools.ObjectExplorer = new ObjectExplorerSettings() { GroupBySchema = false };
            var children = factory.Object.Expand(node.Object, true, "TestDB", true, new System.Threading.CancellationToken());
            Assert.True(children.Any(c => c.Label == "Tables"), "Tables subfolder in database should be included when group by schema is disabled");
@@ -60,7 +73,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            Assert.True(children.Any(c => c.Label == "Synonyms"), "Synonyms subfolder in database should be included when group by schema is disabled");
        }

-        
+
    }

 }
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeFilterTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeFilterTests.cs
@@ -9,9 +9,9 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
 using NUnit.Framework;
 using Newtonsoft.Json.Linq;
@@ -908,7 +908,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        [TestCaseSource("ConvertExpandNodeFilterToNodeFilterTestCases")]
        public void TestConvertExpandNodeFilterToNodeFilter(NodeFilter filter, NodeFilterProperty prop, INodeFilter expectedParsedFilter)
        {
-            INodeFilter actualParsedFilter = ObjectExplorerUtils.ConvertExpandNodeFilterToNodeFilter(filter, prop);
+            INodeFilter actualParsedFilter = filter.ToINodeFilter(prop);
            Assert.That(
                JsonConvert.SerializeObject(actualParsedFilter),
                Is.EqualTo(JsonConvert.SerializeObject(expectedParsedFilter)),
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs
@@ -7,8 +7,8 @@

 using System.Collections.Generic;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
 using NUnit.Framework;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
@@ -29,7 +29,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
                NodeValue = serverName
            };

-            serverSession = new ObjectExplorerService.ObjectExplorerSession("serverUri", serverRoot, null, null);
+            serverSession = new ObjectExplorerService.ObjectExplorerSession("serverUri", serverRoot);

            var databaseRoot = new TreeNode
            {
@@ -38,7 +38,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
                Parent = serverRoot
            };

-            databaseSession = new ObjectExplorerService.ObjectExplorerSession("databaseUri", databaseRoot, null, null);
+            databaseSession = new ObjectExplorerService.ObjectExplorerSession("databaseUri", databaseRoot);
        }

        [Test]
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodeTests.cs
@@ -4,24 +4,28 @@
 //

 #nullable disable
-
 using System;
 using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
 using System.Globalization;
+using System.IO;
 using System.Threading;
+
+using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.Extensibility;
+using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
 using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
+
 using Moq;
+
 using NUnit.Framework;
-using Microsoft.SqlTools.ServiceLayer.Connection;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
 {
@@ -31,16 +35,17 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
    public class NodeTests : ObjectExplorerTestBase
    {
        private string defaultOwnerUri = "objectexplorer://myserver";
-        private ServerInfo defaultServerInfo;
+        private ObjectExplorerServerInfo oeServerInfo = null;
        private ConnectionDetails defaultConnectionDetails;
        private ConnectionCompleteParams defaultConnParams;
        private string fakeConnectionString = "Data Source=server;Initial Catalog=database;Integrated Security=False;User Id=user";
        private ServerConnection serverConnection = null;

+
        [SetUp]
        public void InitNodeTests()
        {
-            defaultServerInfo = TestObjects.GetTestServerInfo();
+            var defaultServerInfo = TestObjects.GetTestServerInfo();
            serverConnection = new ServerConnection(new SqlConnection(fakeConnectionString));

            defaultConnectionDetails = new ConnectionDetails()
@@ -53,31 +58,41 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            defaultConnParams = new ConnectionCompleteParams()
            {
                ServerInfo = defaultServerInfo,
-                ConnectionSummary = defaultConnectionDetails != null ? ((IConnectionSummary)defaultConnectionDetails).Clone(): null,
+                ConnectionSummary = defaultConnectionDetails != null ? ((IConnectionSummary)defaultConnectionDetails).Clone() : null,
                OwnerUri = defaultOwnerUri
            };

+            oeServerInfo = new ObjectExplorerServerInfo()
+            {
+                ServerName = defaultConnectionDetails.ServerName,
+                DatabaseName = defaultConnectionDetails.DatabaseName,
+                UserName = defaultConnectionDetails.UserName,
+                ServerVersion = defaultServerInfo.ServerVersion,
+                EngineEditionId = defaultServerInfo.EngineEditionId,
+                IsCloud = defaultServerInfo.IsCloud
+            };
+
+            var smoquery = typeof(SqlCore.ObjectExplorer.SmoModel.SmoQuerier).Assembly;
            // TODO can all tests use the standard service provider?
-            ServiceProvider = ExtensionServiceProvider.CreateDefaultServiceProvider();
+            ServiceProvider = ExtensionServiceProvider.CreateFromAssembliesInDirectory(Path.GetDirectoryName(smoquery.Location),new string[] { Path.GetFileName(smoquery.Location) });
        }
-        
+
        [Test]
        public void ServerNodeConstructorValidatesFields()
        {
-            Assert.Throws<ArgumentNullException>(() => new ServerNode(null, ServiceProvider, serverConnection));
-            Assert.Throws<ArgumentNullException>(() => new ServerNode(defaultConnParams, null, serverConnection));
+            Assert.Throws<ArgumentNullException>(() => new ServerNode(null, serverConnection, ServiceProvider));
        }

        [Test]
        public void ServerNodeConstructorShouldSetValuesCorrectly()
        {
            // Given a server node with valid inputs
-            ServerNode node = new ServerNode(defaultConnParams, ServiceProvider, serverConnection);
+            ServerNode node = new ServerNode(oeServerInfo, serverConnection, ServiceProvider);
            // Then expect all fields set correctly
            Assert.False(node.IsAlwaysLeaf, "Server node should never be a leaf");
            Assert.AreEqual(defaultConnectionDetails.ServerName, node.NodeValue);

-            string expectedLabel = defaultConnectionDetails.ServerName + " (SQL Server " + defaultServerInfo.ServerVersion + " - "
+            string expectedLabel = defaultConnectionDetails.ServerName + " (SQL Server " + oeServerInfo.ServerVersion + " - "
                + defaultConnectionDetails.UserName + ")";
            Assert.AreEqual(expectedLabel, node.Label);

@@ -91,55 +106,43 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        public void ServerNodeLabelShouldIgnoreUserNameIfEmptyOrNull()
        {
            // Given no username set
-            ConnectionSummary integratedAuthSummary = new ConnectionSummary()
-            {
-                DatabaseName = defaultConnectionDetails.DatabaseName,
-                ServerName = defaultConnectionDetails.ServerName,
-                UserName = null
-            };
-            ConnectionCompleteParams connParams = new ConnectionCompleteParams()
-            {
-                ConnectionSummary = integratedAuthSummary,
-                ServerInfo = defaultServerInfo,
-                OwnerUri = defaultOwnerUri
-            };
+            oeServerInfo.UserName = null;
            // When querying label
-            string label = new ServerNode(connParams, ServiceProvider, serverConnection).Label;
+            string label = new ServerNode(oeServerInfo, serverConnection, ServiceProvider).Label;
            // Then only server name and version shown
-            string expectedLabel = defaultConnectionDetails.ServerName + " (SQL Server " + defaultServerInfo.ServerVersion + ")";
+            string expectedLabel = oeServerInfo.ServerName + " (SQL Server " + oeServerInfo.ServerVersion + ")";
            Assert.AreEqual(expectedLabel, label);
        }

        [Test]
        public void ServerNodeConstructorShouldShowDbNameForCloud()
        {
-            defaultServerInfo.IsCloud = true;
+            oeServerInfo.IsCloud = true;

            // Given a server node for a cloud DB, with master name
-            ServerNode node = new ServerNode(defaultConnParams, ServiceProvider, serverConnection);
+            ServerNode node = new ServerNode(oeServerInfo, serverConnection);
            // Then expect label to not include db name
-            string expectedLabel = defaultConnectionDetails.ServerName + " (SQL Server " + defaultServerInfo.ServerVersion + " - "
-                + defaultConnectionDetails.UserName + ")";
+            string expectedLabel = oeServerInfo.ServerName + " (SQL Server " + oeServerInfo.ServerVersion + " - "
+                + oeServerInfo.UserName + ")";
            Assert.AreEqual(expectedLabel, node.Label);

            // But given a server node for a cloud DB that's not master
-            defaultConnectionDetails.DatabaseName = "NotMaster";
-            defaultConnParams.ConnectionSummary.DatabaseName = defaultConnectionDetails.DatabaseName;
-            node = new ServerNode(defaultConnParams, ServiceProvider, serverConnection);
+            oeServerInfo.DatabaseName = "NotMaster";
+            node = new ServerNode(oeServerInfo, serverConnection, ServiceProvider);

            // Then expect label to include db name 
-            expectedLabel = defaultConnectionDetails.ServerName + " (SQL Server " + defaultServerInfo.ServerVersion + " - "
-                + defaultConnectionDetails.UserName + ", " + defaultConnectionDetails.DatabaseName + ")";
+            expectedLabel = oeServerInfo.ServerName + " (SQL Server " + oeServerInfo.ServerVersion + " - "
+                + oeServerInfo.UserName + ", " + oeServerInfo.DatabaseName + ")";
            Assert.AreEqual(expectedLabel, node.Label);
        }

        [Test]
-        public void ToNodeInfoIncludeAllFields()
+        public void NodeInfoConstructorPopulatesAllFieldsFromTreeNode()
        {
            // Given a server connection
-            ServerNode node = new ServerNode(defaultConnParams, ServiceProvider, serverConnection);
+            ServerNode node = new ServerNode(oeServerInfo, serverConnection, ServiceProvider);
            // When converting to NodeInfo
-            NodeInfo info = node.ToNodeInfo();
+            NodeInfo info = new NodeInfo(node);
            // Then all fields should match
            Assert.AreEqual(node.IsAlwaysLeaf, info.IsLeaf);
            Assert.AreEqual(node.Label, info.Label);
@@ -192,21 +195,21 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        public void MultiLevelTreeShouldFormatPath()
        {
            TreeNode root = new TreeNode("root");
-            Assert.AreEqual("root" , root.GetNodePath());
+            Assert.AreEqual("root", root.GetNodePath());

            TreeNode level1Child1 = new TreeNode("L1C1 (with extra info)");
            level1Child1.NodePathName = "L1C1";
            TreeNode level1Child2 = new TreeNode("L1C2");
            root.AddChild(level1Child1);
            root.AddChild(level1Child2);
-            Assert.AreEqual("root/L1C1" , level1Child1.GetNodePath());
+            Assert.AreEqual("root/L1C1", level1Child1.GetNodePath());
            Assert.AreEqual("root/L1C2", level1Child2.GetNodePath());

            TreeNode level2Child1 = new TreeNode("L2C2");
            level1Child1.AddChild(level2Child1);
            Assert.AreEqual("root/L1C1/L2C2", level2Child1.GetNodePath());
        }
-        
+
        [Test]
        public void ServerNodeContextShouldIncludeServer()
        {
@@ -254,7 +257,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            // Then I expect it to be in an error state 
            Assert.Null(context);
            Assert.AreEqual(
-                string.Format(CultureInfo.CurrentCulture, SR.TreeNodeError, expectedMsg),
+                string.Format(CultureInfo.CurrentCulture, SqlTools.SqlCore.SR.TreeNodeError, expectedMsg),
                node.ErrorStateMessage);
        }

@@ -272,19 +275,19 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            // Then I expect it to be in an error state 
            Assert.Null(context);
            Assert.AreEqual(
-                string.Format(CultureInfo.CurrentCulture, SR.TreeNodeError, expectedMsg),
+                string.Format(CultureInfo.CurrentCulture, SqlTools.SqlCore.SR.TreeNodeError, expectedMsg),
                node.ErrorStateMessage);
        }
-        
+
        [Test]
        public void QueryContextShouldNotCallOpenOnAlreadyOpenConnection()
        {
            // given a server connection that will state its connection is open
            Server smoServer = new Server(new ServerConnection(new SqlConnection(fakeConnectionString)));
            Mock<SmoWrapper> wrapper = SetupSmoWrapperForIsOpenTest(smoServer, isOpen: true);
-            
+
            SmoQueryContext context = new SmoQueryContext(smoServer, ServiceProvider, wrapper.Object);
-            
+
            // when I access the Server property
            Server actualServer = context.Server;

@@ -313,9 +316,9 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            // given a server connection that will state its connection is closed
            Server smoServer = new Server(new ServerConnection(new SqlConnection(fakeConnectionString)));
            Mock<SmoWrapper> wrapper = SetupSmoWrapperForIsOpenTest(smoServer, isOpen: false);
-            
+
            SmoQueryContext context = new SmoQueryContext(smoServer, ServiceProvider, wrapper.Object);
-            
+
            // when I access the Server property
            Server actualServer = context.Server;

@@ -330,7 +333,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            // given a server connection that will state its connection is closed
            Server smoServer = new Server(new ServerConnection(new SqlConnection(fakeConnectionString)));
            Mock<SmoWrapper> wrapper = SetupSmoWrapperForIsOpenTest(smoServer, isOpen: false);
-            
+
            SmoQueryContext context = new SmoQueryContext(smoServer, ServiceProvider, wrapper.Object);
            context.Parent = smoServer;
            // when I access the Parent property
@@ -378,7 +381,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer

        private ServerNode SetupServerNodeWithCreator(SmoWrapper creator)
        {
-            ServerNode node = new ServerNode(defaultConnParams, ServiceProvider, new ServerConnection(new SqlConnection(fakeConnectionString)));
+            ServerNode node = new ServerNode(oeServerInfo, new ServerConnection(new SqlConnection(fakeConnectionString)), ServiceProvider, () => false);
            node.SmoWrapper = creator;
            return node;
        }
@@ -408,20 +411,20 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer

            // Then I expect it to contain server-level folders 
            Assert.AreEqual(3, children.Count);
-            VerifyTreeNode<FolderNode>(children[0], "Folder", SR.SchemaHierarchy_Databases);
-            VerifyTreeNode<FolderNode>(children[1], "Folder", SR.SchemaHierarchy_Security);
-            VerifyTreeNode<FolderNode>(children[2], "Folder", SR.SchemaHierarchy_ServerObjects);
+            VerifyTreeNode<FolderNode>(children[0], "Folder", SqlTools.SqlCore.SR.SchemaHierarchy_Databases);
+            VerifyTreeNode<FolderNode>(children[1], "Folder", SqlTools.SqlCore.SR.SchemaHierarchy_Security);
+            VerifyTreeNode<FolderNode>(children[2], "Folder", SqlTools.SqlCore.SR.SchemaHierarchy_ServerObjects);
            // And the database is contained under it
            TreeNode databases = children[0];
            IList<TreeNode> dbChildren = databases.Expand(new CancellationToken());
            Assert.AreEqual(2, dbChildren.Count);
-            Assert.AreEqual(SR.SchemaHierarchy_SystemDatabases, dbChildren[0].NodeValue);
+            Assert.AreEqual(SqlTools.SqlCore.SR.SchemaHierarchy_SystemDatabases, dbChildren[0].NodeValue);

            TreeNode dbNode = dbChildren[1];
            Assert.AreEqual(dbName, dbNode.NodeValue);
            Assert.AreEqual(dbName, dbNode.Label);
            Assert.False(dbNode.IsAlwaysLeaf);
-            
+
            // Note: would like to verify Database in the context, but cannot since it's a Sealed class and isn't easily mockable
        }

--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs
@@ -16,7 +16,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
 using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Moq;
 using Moq.Protected;
@@ -282,7 +282,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
            var foundNodes = service.FindNodes(session.SessionId, "Server", null, null, null);
            Assert.AreEqual(1, foundNodes.Count);
            Assert.AreEqual("Server", foundNodes[0].NodeType);
-            Assert.AreEqual(session.RootNode.NodePath, foundNodes[0].ToNodeInfo().NodePath);
+            Assert.AreEqual(session.RootNode.NodePath, new NodeInfo(foundNodes[0]).NodePath);
        }

        [Test]
@@ -298,7 +298,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        public void FindNodeCanExpandParentNodes()
        {
            var mockTreeNode = new Mock<TreeNode>();
-            object[] populateChildrenArguments = { ItExpr.Is<bool>(x => x == false), ItExpr.IsNull<string>(), new CancellationToken(), ItExpr.IsNull<string>(), ItExpr.IsNull<IEnumerable<NodeFilter>>() };
+            object[] populateChildrenArguments = { ItExpr.Is<bool>(x => x == false), ItExpr.IsNull<string>(), new CancellationToken(), ItExpr.IsNull<string>(), ItExpr.IsNull<IEnumerable<INodeFilter>>() };
            mockTreeNode.Protected().Setup("PopulateChildren", populateChildrenArguments);
            mockTreeNode.Object.IsAlwaysLeaf = false;

--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerTestBase.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerTestBase.cs
@@ -8,8 +8,8 @@
 using Microsoft.SqlTools.Extensibility;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
 {
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ServerVersionHelperTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ServerVersionHelperTests.cs
@@ -5,8 +5,7 @@

 #nullable disable

-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer;
 using NUnit.Framework;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
@@ -59,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
        [TestCase("16.1.2.3", SqlServerType.Sql2022)]
        public void CalculateServerTypeShouldReturnExpectedValue(string serverVersion, SqlServerType expectedServerType)
        {
-            ServerInfo serverInfo = new ServerInfo
+            ObjectExplorerServerInfo serverInfo = new ObjectExplorerServerInfo
            {
                ServerVersion = serverVersion
            };
@@ -128,7 +127,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer

        private void VerifyCalculateServerTypeForEngineEdition(int engineEdition, SqlServerType expected)
        {
-            ServerInfo serverInfo = new ServerInfo
+            ObjectExplorerServerInfo serverInfo = new ObjectExplorerServerInfo
            {
                EngineEditionId = engineEdition
            };
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/SmoQueryModelTests.cs
@@ -6,24 +6,32 @@
 #nullable disable

 using System;
+using System.IO;
 using System.Linq;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.Extensibility;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.Nodes;
 using NUnit.Framework;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
 {
    public class SmoQueryModelTests
    {
+        IMultiServiceProvider serviceProvider;
+
+        [SetUp]
+        public void Setup()
+        {
+            // Given the extension type loader is set to find SmoCollectionQuerier objects
+            var assembly = typeof(SmoQuerier).Assembly;
+            serviceProvider = ExtensionServiceProvider.CreateFromAssembliesInDirectory(Path.GetDirectoryName(assembly.Location), new string[] { Path.GetFileName(assembly.Location) });
+        }

        [Test]
        public void ShouldFindDatabaseQuerierFromRealPath()
        {
-            // Given the extension type loader is set to find SmoCollectionQuerier objects
-            IMultiServiceProvider serviceProvider = ExtensionServiceProvider.CreateDefaultServiceProvider();
            // When I request a database compatible querier
            SmoQuerier querier = serviceProvider.GetService<SmoQuerier>(q => q.SupportedObjectTypes.Contains(typeof(Database)));
            // Then I expect to get back the SqlDatabaseQuerier
@@ -87,8 +95,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer

        private SmoQuerier GetSmoQuerier(Type querierType)
        {
-            // Given the extension type loader is set to find SmoCollectionQuerier objects
-            IMultiServiceProvider serviceProvider = ExtensionServiceProvider.CreateDefaultServiceProvider();
            // When I request a compatible querier
            SmoQuerier querier = serviceProvider.GetService<SmoQuerier>(q => q.SupportedObjectTypes.Contains(querierType));
            // Then I expect to get back the Querier
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/UsersChildFactoryTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/UsersChildFactoryTests.cs
@@ -6,7 +6,7 @@
 #nullable disable

 using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
+using Microsoft.SqlTools.SqlCore.ObjectExplorer.SmoModel;
 using NUnit.Framework;

 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer