diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs index 2735ad3b..5e06e131 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs @@ -1141,14 +1141,6 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string SchemaHierarchy_LinkedServerLogins - { - get - { - return Keys.GetString(Keys.SchemaHierarchy_LinkedServerLogins); - } - } - public static string SchemaHierarchy_Logins { get @@ -13460,9 +13452,6 @@ namespace Microsoft.SqlTools.ServiceLayer public const string SchemaHierarchy_LinkedServers = "SchemaHierarchy_LinkedServers"; - public const string SchemaHierarchy_LinkedServerLogins = "SchemaHierarchy_LinkedServerLogins"; - - public const string SchemaHierarchy_Logins = "SchemaHierarchy_Logins"; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx index 361f25ac..71ae2786 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx @@ -838,10 +838,6 @@ Linked Servers - - Linked Server Logins - - Logins diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings index b6b5065f..e48d35fb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings @@ -410,8 +410,6 @@ SchemaHierarchy_Keys = Keys SchemaHierarchy_LinkedServers = Linked Servers -SchemaHierarchy_LinkedServerLogins = Linked Server Logins - SchemaHierarchy_Logins = Logins SchemaHierarchy_MasterKey = Master Key diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf index 53aa0ef1..b06d3e7d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf @@ -657,11 +657,6 @@ Linked Servers - - Linked Server Logins - Linked Server Logins - - Logins Logins diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeTypes.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeTypes.cs index d939f375..ab32f732 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeTypes.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeTypes.cs @@ -79,7 +79,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes ServerLevelCryptographicProviders, ServerLevelEndpoints, ServerLevelErrorMessages, - ServerLevelLinkedServerLogins, ServerLevelLinkedServers, ServerLevelLogins, ServerLevelSecurity, diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodes.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodes.cs index 397dbfcb..0812f902 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodes.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodes.cs @@ -315,13 +315,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel protected override void OnExpandPopulateFolders(IList currentChildren, TreeNode parent) { - currentChildren.Add(new FolderNode { - NodeValue = SR.SchemaHierarchy_LinkedServerLogins, - NodeTypeId = NodeTypes.ServerLevelLinkedServerLogins, - IsSystemObject = false, - ValidFor = ValidForFlag.AllOnPrem, - SortPriority = SmoTreeNode.NextSortPriority, - }); currentChildren.Add(new FolderNode { NodeValue = SR.SchemaHierarchy_Logins, NodeTypeId = NodeTypes.ServerLevelLogins, @@ -455,30 +448,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel } } - [Export(typeof(ChildFactory))] - [Shared] - internal partial class ServerLevelLinkedServerLoginsChildFactory : SmoChildFactoryBase - { - public override IEnumerable ApplicableParents() { return new[] { nameof(NodeTypes.ServerLevelLinkedServerLogins) }; } - - internal override Type[] ChildQuerierTypes - { - get - { - return new [] { typeof(SqlLinkedServerLoginQuerier), }; - } - } - - public override TreeNode CreateChild(TreeNode parent, object context) - { - var child = new SmoTreeNode(); - child.IsAlwaysLeaf = true; - child.NodeType = "ServerLevelLinkedServerLogin"; - InitializeChild(parent, child, context); - return child; - } - } - [Export(typeof(ChildFactory))] [Shared] internal partial class ServerLevelLoginsChildFactory : SmoChildFactoryBase diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml index 81d1dd72..be6f3b1f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml @@ -18,7 +18,6 @@ - @@ -49,7 +48,6 @@ --> -