diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs deleted file mode 100644 index 1fc15c05a3..0000000000 --- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Cms.Core.Hosting; - -namespace Umbraco.Extensions; - -public static class GlobalSettingsExtensions -{ - /// - /// Returns the absolute path for the Umbraco back office - /// - /// - /// - /// - [Obsolete("The UmbracoPath setting is removed, use IHostingEnvironment.GetBackOfficePath() instead. Scheduled for removal in Umbraco 17.")] - public static string GetBackOfficePath(this GlobalSettings globalSettings, IHostingEnvironment hostingEnvironment) - => hostingEnvironment.GetBackOfficePath(); - - /// - /// This returns the string of the MVC Area route. - /// - /// - /// This will return the MVC area that we will route all custom routes through like surface controllers, etc... - /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a - /// path of ~/asdf/asdf/admin - /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work. - /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up - /// with something - /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco". - /// - [Obsolete("The UmbracoPath setting is removed, use Constants.System.UmbracoPathSegment as area name instead. Scheduled for removal in Umbraco 17.")] - public static string GetUmbracoMvcArea(this GlobalSettings globalSettings, IHostingEnvironment hostingEnvironment) - => Constants.System.UmbracoPathSegment; -} diff --git a/src/Umbraco.Core/Extensions/ObjectExtensions.cs b/src/Umbraco.Core/Extensions/ObjectExtensions.cs index 808e14d4b3..c53eee27a5 100644 --- a/src/Umbraco.Core/Extensions/ObjectExtensions.cs +++ b/src/Umbraco.Core/Extensions/ObjectExtensions.cs @@ -351,7 +351,6 @@ public static class ObjectExtensions return Attempt.Fail(); } - [Obsolete("This method is no longer used in Umbraco. The method will be removed in Umbraco 17.")] /// /// Attempts to convert the input string to the output type. /// diff --git a/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs index 88ed9b44a9..5fce89bc47 100644 --- a/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs +++ b/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs @@ -137,14 +137,6 @@ public static class PublishedContentExtensions return content.GetParent(navigationQueryService, publishedStatusFilteringService) as T; } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Parent( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.Parent(navigationQueryService, GetPublishedStatusFilteringService(content)); - private static IPublishedContent? GetParent( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -513,22 +505,6 @@ public static class PublishedContentExtensions IPublishedStatusFilteringService publishedStatusFilteringService) => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, false, null); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the ancestors of the content, at a level lesser or equal to a specified level. /// @@ -549,24 +525,6 @@ public static class PublishedContentExtensions false, n => n.Level <= maxLevel); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the ancestors of the content, of a specified content type. /// @@ -591,24 +549,6 @@ public static class PublishedContentExtensions contentTypeAlias); } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias) - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - /// /// Gets the ancestors of the content, of a specified content type. /// @@ -625,24 +565,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Ancestors(navigationQueryService, publishedStatusFilteringService).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - where T : class, IPublishedContent - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the ancestors of the content, at a level lesser or equal to a specified level, and of a specified content /// type. @@ -667,26 +589,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Ancestors(navigationQueryService, publishedStatusFilteringService, maxLevel).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Ancestors( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.Ancestors(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the content and its ancestors. /// @@ -700,22 +602,6 @@ public static class PublishedContentExtensions IPublishedStatusFilteringService publishedStatusFilteringService) => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, true, null); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the content and its ancestors, at a level lesser or equal to a specified level. /// @@ -742,24 +628,6 @@ public static class PublishedContentExtensions true, n => n.Level <= maxLevel); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the content and its ancestors, of a specified content type. /// @@ -784,24 +652,6 @@ public static class PublishedContentExtensions contentTypeAlias); } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - /// /// Gets the content and its ancestors, of a specified content type. /// @@ -818,24 +668,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - where T : class, IPublishedContent - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the content and its ancestor, at a lever lesser or equal to a specified level, and of a specified content /// type. @@ -858,26 +690,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, maxLevel).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the ancestor of the content, ie its parent. /// @@ -892,13 +704,6 @@ public static class PublishedContentExtensions IPublishedStatusFilteringService publishedStatusFilteringService) => content.GetParent(navigationQueryService, publishedStatusFilteringService); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Ancestor( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the nearest ancestor of the content, at a lever lesser or equal to a specified level. /// @@ -917,24 +722,6 @@ public static class PublishedContentExtensions .EnumerateAncestors(navigationQueryService, publishedStatusFilteringService, false) .FirstOrDefault(x => x.Level <= maxLevel); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Ancestor( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Ancestor( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the nearest ancestor of the content, of a specified content type. /// @@ -961,24 +748,6 @@ public static class PublishedContentExtensions .FirstOrDefault(); } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Ancestor( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias) - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Ancestor( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias) - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - /// /// Gets the nearest ancestor of the content, of a specified content type. /// @@ -995,24 +764,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Ancestors(navigationQueryService, publishedStatusFilteringService).FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Ancestor( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - where T : class, IPublishedContent - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Ancestor( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the nearest ancestor of the content, at the specified level and of the specified content type. /// @@ -1034,26 +785,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Ancestors(navigationQueryService, publishedStatusFilteringService, maxLevel).FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Ancestor( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Ancestor( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.Ancestor(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the content or its nearest ancestor. /// @@ -1080,24 +811,6 @@ public static class PublishedContentExtensions .EnumerateAncestors(navigationQueryService, publishedStatusFilteringService, true) .FirstOrDefault(x => x.Level <= maxLevel) ?? content; - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent AncestorOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent AncestorOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - /// /// Gets the content or its nearest ancestor, of a specified content type. /// @@ -1124,24 +837,6 @@ public static class PublishedContentExtensions .FirstOrDefault() ?? content; } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent AncestorOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias) - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent AncestorOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias) - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias); - /// /// Gets the content or its nearest ancestor, of a specified content type. /// @@ -1158,24 +853,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService).FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? AncestorOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - where T : class, IPublishedContent - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? AncestorOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the content or its nearest ancestor, at a lever lesser or equal to a specified level, and of a specified /// content type. @@ -1194,26 +871,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, maxLevel).FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? AncestorOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? AncestorOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int maxLevel) - where T : class, IPublishedContent - => content.AncestorOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), maxLevel); - public static IEnumerable AncestorsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1228,26 +885,6 @@ public static class PublishedContentExtensions return func == null ? ancestorsOrSelf : ancestorsOrSelf.Where(func); } - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - bool orSelf, - Func? func) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), orSelf, func); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable AncestorsOrSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - bool orSelf, - Func? func) - => content.AncestorsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), orSelf, func); - private static IEnumerable EnumerateAncestors( this IPublishedContent? content, INavigationQueryService navigationQueryService, @@ -1280,14 +917,6 @@ public static class PublishedContentExtensions bool andSelf = true) => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, andSelf, null).Reverse(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Breadcrumbs( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - bool andSelf = true) - => content.Breadcrumbs(navigationQueryService, GetPublishedStatusFilteringService(content), andSelf); - /// /// Gets the breadcrumbs (ancestors and self, top to bottom) for the specified at a level /// higher or equal to . @@ -1309,15 +938,6 @@ public static class PublishedContentExtensions bool andSelf = true) => content.AncestorsOrSelf(navigationQueryService, publishedStatusFilteringService, andSelf, n => n.Level >= minLevel).Reverse(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Breadcrumbs( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int minLevel, - bool andSelf = true) - => content.Breadcrumbs(navigationQueryService, GetPublishedStatusFilteringService(content), minLevel, andSelf); - /// /// Gets the breadcrumbs (ancestors and self, top to bottom) for the specified at a level /// higher or equal to the specified root content type . @@ -1342,88 +962,10 @@ public static class PublishedContentExtensions .TakeWhile(n => n is T) .Reverse(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Breadcrumbs( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - bool andSelf = true) - where T : class, IPublishedContent - => content.Breadcrumbs(navigationQueryService, GetPublishedStatusFilteringService(content), andSelf); - #endregion #region Axes: descendants, descendants-or-self - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string docTypeAlias, - string? culture = null) - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelfOfType( - navigationQueryService, - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - docTypeAlias, - culture); - } - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string docTypeAlias, - string? culture = null) - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelfOfType( - navigationQueryService, - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - docTypeAlias, - culture); - } - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelf( - navigationQueryService, - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - culture); - } - - [Obsolete("Use the overload with IPublishStatusQueryService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelf( - navigationQueryService, - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - culture); - } - - // as per XPath 1.0 specs �2.2, // - the descendant axis contains the descendants of the context node; a descendant is a child or a child of a child and so on; thus // the descendant axis never contains attribute or namespace nodes. @@ -1449,25 +991,6 @@ public static class PublishedContentExtensions string? culture = null) => content.DescendantsOrSelf(navigationQueryService, publishedStatusFilteringService, false, null, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IEnumerable Descendants( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1481,27 +1004,6 @@ public static class PublishedContentExtensions p => p.Level >= level, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IEnumerable DescendantsOfType( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1515,27 +1017,6 @@ public static class PublishedContentExtensions false, contentTypeAlias); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - public static IEnumerable Descendants( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1544,27 +1025,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Descendants(navigationQueryService, publishedStatusFilteringService, culture).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IEnumerable Descendants( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1574,29 +1034,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Descendants(navigationQueryService, publishedStatusFilteringService, level, culture).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IEnumerable DescendantsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1604,25 +1041,6 @@ public static class PublishedContentExtensions string? culture = null) => content.DescendantsOrSelf(navigationQueryService, publishedStatusFilteringService, true, null, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IEnumerable DescendantsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1631,27 +1049,6 @@ public static class PublishedContentExtensions string? culture = null) => content.DescendantsOrSelf(navigationQueryService, publishedStatusFilteringService, true, p => p.Level >= level, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IEnumerable DescendantsOrSelfOfType( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1665,27 +1062,6 @@ public static class PublishedContentExtensions true, contentTypeAlias); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOrSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOrSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - public static IEnumerable DescendantsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1694,27 +1070,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.DescendantsOrSelf(navigationQueryService, publishedStatusFilteringService, culture).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IEnumerable DescendantsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1724,29 +1079,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.DescendantsOrSelf(navigationQueryService, publishedStatusFilteringService, level, culture).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IPublishedContent? Descendant( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1754,25 +1086,6 @@ public static class PublishedContentExtensions string? culture = null) => content.Children(navigationQueryService, publishedStatusFilteringService, culture)?.FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IPublishedContent? Descendant( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1783,27 +1096,6 @@ public static class PublishedContentExtensions .EnumerateDescendants(navigationQueryService, publishedStatusFilteringService, false, culture) .FirstOrDefault(x => x.Level == level); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IPublishedContent? DescendantOfType( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1819,27 +1111,6 @@ public static class PublishedContentExtensions contentTypeAlias) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - public static T? Descendant( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1850,27 +1121,6 @@ public static class PublishedContentExtensions .EnumerateDescendants(navigationQueryService, publishedStatusFilteringService, false, culture) .FirstOrDefault(x => x is T) as T; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static T? Descendant( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1880,29 +1130,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Descendant(navigationQueryService, publishedStatusFilteringService, level, culture) as T; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IPublishedContent DescendantOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1916,21 +1143,6 @@ public static class PublishedContentExtensions .FirstOrDefault() ?? content; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - public static IPublishedContent? DescendantOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1941,28 +1153,6 @@ public static class PublishedContentExtensions .EnumerateDescendants(navigationQueryService, publishedStatusFilteringService, true, culture) .FirstOrDefault(x => x.Level == level); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - public static IPublishedContent? DescendantOrSelfOfType( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -1978,27 +1168,6 @@ public static class PublishedContentExtensions contentTypeAlias) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOrSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOrSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - public static T? DescendantOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2009,27 +1178,6 @@ public static class PublishedContentExtensions .EnumerateDescendants(navigationQueryService, publishedStatusFilteringService, true, culture) .FirstOrDefault(x => x is T) as T; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static T? DescendantOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2039,29 +1187,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.DescendantOrSelf(navigationQueryService, publishedStatusFilteringService, level, culture) as T; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(navigationQueryService, GetPublishedStatusFilteringService(content), level, culture); - private static IEnumerable DescendantsOrSelf( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2131,25 +1256,6 @@ public static class PublishedContentExtensions string? culture = null) => GetChildren(navigationQueryService, publishedStatusFilteringService, content.Key, null, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor? variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor? variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - /// /// Gets the children of the content, filtered by a predicate. /// @@ -2174,27 +1280,6 @@ public static class PublishedContentExtensions string? culture = null) => content.Children(navigationQueryService, publishedStatusFilteringService, culture).Where(predicate); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - Func predicate, - string? culture = null) - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - /// /// Gets the children of the content, of any of the specified types. /// @@ -2217,27 +1302,6 @@ public static class PublishedContentExtensions ? GetChildren(navigationQueryService, publishedStatusFilteringService, content.Key, contentTypeAlias, culture) : []; - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable ChildrenOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? contentTypeAlias, - string? culture = null) - => content.ChildrenOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable ChildrenOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? contentTypeAlias, - string? culture = null) - => content.ChildrenOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - /// /// Gets the children of the content, of a given content type. /// @@ -2263,27 +1327,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.Children(navigationQueryService, publishedStatusFilteringService, culture).OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Children(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static IPublishedContent? FirstChild( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2293,25 +1336,6 @@ public static class PublishedContentExtensions .Children(navigationQueryService, publishedStatusFilteringService, culture) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - /// /// Gets the first child of the content, of a given content type. /// @@ -2325,27 +1349,6 @@ public static class PublishedContentExtensions .ChildrenOfType(navigationQueryService, publishedStatusFilteringService, contentTypeAlias, culture) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChildOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.FirstChildOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChildOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.FirstChildOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - public static IPublishedContent? FirstChild( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2356,27 +1359,6 @@ public static class PublishedContentExtensions .Children(navigationQueryService, publishedStatusFilteringService, predicate, culture) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - Func predicate, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - public static IPublishedContent? FirstChild( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2387,27 +1369,6 @@ public static class PublishedContentExtensions .Children(navigationQueryService, publishedStatusFilteringService, x => x.Key == uniqueId, culture) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - Guid uniqueId, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), uniqueId, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - Guid uniqueId, - string? culture = null) - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), uniqueId, culture); - public static T? FirstChild( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2418,27 +1379,6 @@ public static class PublishedContentExtensions .Children(navigationQueryService, publishedStatusFilteringService, culture) .FirstOrDefault(); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - public static T? FirstChild( this IPublishedContent content, INavigationQueryService navigationQueryService, @@ -2450,29 +1390,6 @@ public static class PublishedContentExtensions .Children(navigationQueryService, publishedStatusFilteringService, culture) .FirstOrDefault(predicate); - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService instead, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - Func predicate, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(navigationQueryService, GetPublishedStatusFilteringService(content), predicate, culture); - #endregion #region Axes: siblings @@ -2500,25 +1417,6 @@ public static class PublishedContentExtensions .SiblingsAndSelf(navigationQueryService, publishedStatusFilteringService, culture) .Where(x => x.Id != content.Id); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Siblings(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.Siblings(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - /// /// Gets the siblings of the content, of a given content type. /// @@ -2544,27 +1442,6 @@ public static class PublishedContentExtensions .SiblingsAndSelfOfType(navigationQueryService, publishedStatusFilteringService, contentTypeAlias, culture) .Where(x => x.Id != content.Id); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.SiblingsOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.SiblingsOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - /// /// Gets the siblings of the content, of a given content type. /// @@ -2590,27 +1467,6 @@ public static class PublishedContentExtensions .SiblingsAndSelf(navigationQueryService, publishedStatusFilteringService, culture) .Where(x => x.Id != content.Id); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Siblings(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Siblings(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - /// /// Gets the siblings of the content including the node itself to indicate the position. /// @@ -2629,25 +1485,6 @@ public static class PublishedContentExtensions string? culture = null) => content.SiblingsAndSelfInternal(navigationQueryService, publishedStatusFilteringService, null, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.SiblingsAndSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.SiblingsAndSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - /// /// Gets the siblings of the content including the node itself to indicate the position, of a given content type. /// @@ -2668,27 +1505,6 @@ public static class PublishedContentExtensions string? culture = null) => content.SiblingsAndSelfInternal(navigationQueryService, publishedStatusFilteringService, contentTypeAlias, culture); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.SiblingsAndSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string contentTypeAlias, - string? culture = null) - => content.SiblingsAndSelfOfType(navigationQueryService, GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - /// /// Gets the siblings of the content including the node itself to indicate the position, of a given content type. /// @@ -2711,27 +1527,6 @@ public static class PublishedContentExtensions .SiblingsAndSelfInternal(navigationQueryService, publishedStatusFilteringService, null, culture) .OfType(); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.SiblingsAndSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.SiblingsAndSelf(navigationQueryService, GetPublishedStatusFilteringService(content), culture); - #endregion #region Axes: custom @@ -2756,22 +1551,6 @@ public static class PublishedContentExtensions IPublishedStatusFilteringService publishedStatusFilteringService) => content.AncestorOrSelf(navigationQueryService, publishedStatusFilteringService, 1); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent Root( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - => content.Root(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent Root( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - => content.Root(navigationQueryService, GetPublishedStatusFilteringService(content)); - /// /// Gets the root content (ancestor or self at level 1) for the specified if it's of the /// specified content type . @@ -2796,24 +1575,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent => content.AncestorOrSelf(navigationQueryService, publishedStatusFilteringService, 1); - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Root( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService, - IPublishStatusQueryService publishStatusQueryService) - where T : class, IPublishedContent - => content.Root(navigationQueryService, GetPublishedStatusFilteringService(content)); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Root( - this IPublishedContent content, - IPublishedCache publishedCache, - INavigationQueryService navigationQueryService) - where T : class, IPublishedContent - => content.Root(navigationQueryService, GetPublishedStatusFilteringService(content)); - #endregion #region Writer and creator @@ -2945,73 +1706,6 @@ public static class PublishedContentExtensions where T : class, IPublishedContent=> content.Breadcrumbs(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), andSelf); - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor? variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor? variationContextAccessor, - string? culture = null) - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - Func predicate, - string? culture = null) - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable ChildrenOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? contentTypeAlias, - string? culture = null) - => content.ChildrenOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable ChildrenOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? contentTypeAlias, - string? culture = null) - => content.ChildrenOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Children( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.Children(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - public static IEnumerable DescendantsOrSelfOfType( this IEnumerable parentNodes, INavigationQueryService navigationQueryService, @@ -3024,37 +1718,6 @@ public static class PublishedContentExtensions docTypeAlias, culture)); - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string docTypeAlias, - string? culture = null) - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelfOfType( - GetNavigationQueryService(parentNodesAsArray.First()), - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - docTypeAlias, - culture); - } - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - string docTypeAlias, - string? culture = null) - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelfOfType( - GetNavigationQueryService(parentNodesAsArray.First()), - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - docTypeAlias, - culture); - } - public static IEnumerable DescendantsOrSelf( this IEnumerable parentNodes, INavigationQueryService navigationQueryService, @@ -3066,517 +1729,6 @@ public static class PublishedContentExtensions publishedStatusFilteringService, culture)); - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelf( - GetNavigationQueryService(parentNodesAsArray.First()), - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - culture); - } - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IEnumerable parentNodes, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - { - IPublishedContent[] parentNodesAsArray = parentNodes as IPublishedContent[] ?? parentNodes.ToArray(); - return parentNodesAsArray.DescendantsOrSelf( - GetNavigationQueryService(parentNodesAsArray.First()), - GetPublishedStatusFilteringService(parentNodesAsArray.First()), - culture); - } - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Descendants( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendants(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOrSelfOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.DescendantsOrSelfOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable DescendantsOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantsOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.DescendantOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? Descendant( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.Descendant(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.DescendantOrSelfOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? DescendantOrSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.DescendantOrSelfOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? DescendantOrSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - int level, - string? culture = null) - where T : class, IPublishedContent - => content.DescendantOrSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), level, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChildOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string contentTypeAlias, - string? culture = null) - => content.FirstChildOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChildOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.FirstChildOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - Func predicate, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - Guid uniqueId, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), uniqueId, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IPublishedContent? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - Guid uniqueId, - string? culture = null) - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), uniqueId, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - Func predicate, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static T? FirstChild( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - Func predicate, - string? culture = null) - where T : class, IPublishedContent - => content.FirstChild(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), predicate, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.Siblings(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.SiblingsOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable Siblings( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.Siblings(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable? SiblingsAndSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - => content.SiblingsAndSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelfOfType( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string contentTypeAlias, - string? culture = null) - => content.SiblingsAndSelfOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - IPublishStatusQueryService publishStatusQueryService, - string? culture = null) - where T : class, IPublishedContent - => content.SiblingsAndSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - - [Obsolete("Use the overload with INavigationQueryService and IPublishedStatusFilteringService, scheduled for removal in v17")] - public static IEnumerable SiblingsAndSelf( - this IPublishedContent content, - IVariationContextAccessor variationContextAccessor, - string? culture = null) - where T : class, IPublishedContent - => content.SiblingsAndSelf(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture); - private static INavigationQueryService GetNavigationQueryService(IPublishedContent content) { switch (content.ItemType) diff --git a/src/Umbraco.Core/Routing/UrlProviderExtensions.cs b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs index a4e7fbc209..c36eb478d1 100644 --- a/src/Umbraco.Core/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs @@ -14,58 +14,6 @@ namespace Umbraco.Extensions; public static class UrlProviderExtensions { - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static async Task> GetContentUrlsAsync( - this IContent content, - IPublishedRouter publishedRouter, - IUmbracoContext umbracoContext, - ILanguageService languageService, - ILocalizedTextService textService, - IContentService contentService, - IVariationContextAccessor variationContextAccessor, - ILogger logger, - UriUtility uriUtility, - IPublishedUrlProvider publishedUrlProvider) - => await content.GetContentUrlsAsync( - publishedRouter, - umbracoContext, - languageService, - textService, - contentService, - variationContextAccessor, - logger, - uriUtility, - publishedUrlProvider, - StaticServiceProvider.Instance.GetRequiredService(), - StaticServiceProvider.Instance.GetRequiredService()); - - [Obsolete("Use the overload with IPublishedStatusFilteringService, scheduled for removal in v17")] - public static async Task> GetContentUrlsAsync( - this IContent content, - IPublishedRouter publishedRouter, - IUmbracoContext umbracoContext, - ILanguageService languageService, - ILocalizedTextService textService, - IContentService contentService, - IVariationContextAccessor variationContextAccessor, - ILogger logger, - UriUtility uriUtility, - IPublishedUrlProvider publishedUrlProvider, - IPublishedContentCache contentCache, - IDocumentNavigationQueryService navigationQueryService) - => await content.GetContentUrlsAsync( - publishedRouter, - umbracoContext, - languageService, - textService, - contentService, - variationContextAccessor, - logger, - uriUtility, - publishedUrlProvider, - navigationQueryService, - StaticServiceProvider.Instance.GetRequiredService()); - /// /// Gets the URLs of the content item. ///