diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs index 579c71e206..0696595ef4 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using Umbraco.Core.Models; using Umbraco.Core.Services.Changes; @@ -175,17 +174,6 @@ namespace Umbraco.Web.Cache dc.Remove(MemberCacheRefresher.UniqueId, x => x.Id, members); } - [Obsolete("Use the RefreshMemberCache with strongly typed IMember objects instead")] - public static void RefreshMemberCache(this DistributedCache dc, int memberId) - { - dc.Refresh(MemberCacheRefresher.UniqueId, memberId); - } - - [Obsolete("Use the RemoveMemberCache with strongly typed IMember objects instead")] - public static void RemoveMemberCache(this DistributedCache dc, int memberId) - { - dc.Remove(MemberCacheRefresher.UniqueId, memberId); - } #endregion diff --git a/src/Umbraco.Web/Models/LoginStatusModel.cs b/src/Umbraco.Web/Models/LoginStatusModel.cs index 2a44ca2d00..d9f7ac35d0 100644 --- a/src/Umbraco.Web/Models/LoginStatusModel.cs +++ b/src/Umbraco.Web/Models/LoginStatusModel.cs @@ -37,13 +37,6 @@ namespace Umbraco.Web.Models } } - /// - /// This will construct a new LoginStatusModel and perform a lookup for hte curently logged in member - /// - [Obsolete("Do not use this ctor as it will perform business logic lookups. Use the MembershipHelper.GetCurrentLoginStatus or the static LoginStatusModel.CreateModel() to create an empty model.")] - public LoginStatusModel() - : this(true) - { } /// /// The name of the member diff --git a/src/Umbraco.Web/Models/PartialViewMacroModel.cs b/src/Umbraco.Web/Models/PartialViewMacroModel.cs index 562f275a3f..60e0006adf 100644 --- a/src/Umbraco.Web/Models/PartialViewMacroModel.cs +++ b/src/Umbraco.Web/Models/PartialViewMacroModel.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using Umbraco.Core.Models; +using System.Collections.Generic; using Umbraco.Core.Models.PublishedContent; namespace Umbraco.Web.Models @@ -25,26 +22,11 @@ namespace Umbraco.Web.Models MacroId = macroId; } - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the constructor accepting the macro id instead")] - public PartialViewMacroModel(IPublishedContent page, IDictionary macroParams) - { - Content = page; - MacroParameters = macroParams; - } - - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the Content property instead")] - public IPublishedContent CurrentPage - { - get { return Content; } - } - + public IPublishedContent Content { get; private set; } public string MacroName { get; private set; } public string MacroAlias { get; private set; } public int MacroId { get; private set; } public IDictionary MacroParameters { get; private set; } - } } diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs index dfd80893d9..6bc28e6be5 100644 --- a/src/Umbraco.Web/Models/ProfileModel.cs +++ b/src/Umbraco.Web/Models/ProfileModel.cs @@ -33,11 +33,6 @@ namespace Umbraco.Web.Models } } - [Obsolete("Do not use this ctor as it will perform business logic lookups. Use the MembershipHelper.CreateProfileModel or the static ProfileModel.CreateModel() to create an empty model.")] - public ProfileModel() - :this(true) - { - } [Required] [RegularExpression(@"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs index bcf88d2a11..ffb427ce83 100644 --- a/src/Umbraco.Web/Models/RegisterModel.cs +++ b/src/Umbraco.Web/Models/RegisterModel.cs @@ -37,10 +37,6 @@ namespace Umbraco.Web.Models } } - [Obsolete("Do not use this ctor as it will perform business logic lookups. Use the MembershipHelper.CreateRegistrationModel or the static RegisterModel.CreateModel() to create an empty model.")] - public RegisterModel() - : this(true) - { } [Required] [RegularExpression(@"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs index 8f4499c91d..f23407ab4c 100644 --- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs +++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs @@ -22,13 +22,6 @@ namespace Umbraco.Web.Mvc _profilingLogger = profilingLogger; } - [Obsolete("Use the ctor specifying all depenendencies instead")] - public UmbracoPageResult() - : this(new ProfilingLogger(Current.Logger, Current.Profiler)) - { - - } - public override void ExecuteResult(ControllerContext context) { ResetRouteData(context.RouteData); diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index 1adfb55ca9..9bbf05f8b6 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -37,16 +37,6 @@ namespace Umbraco.Web return content.Url; } - /// - /// Gets the absolute url for the content. - /// - /// The content. - /// The absolute url for the content. - //[Obsolete("UrlWithDomain() is obsolete, use the UrlAbsolute() method instead.")] - public static string UrlWithDomain(this IPublishedContent content) - { - return content.UrlAbsolute(); - } /// /// Gets the absolute url for the content. diff --git a/src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs index 1526cfb2a1..c822c11c06 100644 --- a/src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs +++ b/src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs @@ -43,12 +43,6 @@ namespace Umbraco.Web.Security.Identity /// public Func OnExternalLogin { get; set; } - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the overload specifying user groups instead")] - public string GetDefaultUserType(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo) - { - return _defaultUserGroups.Length == 0 ? "editor" : _defaultUserGroups[0]; - } /// /// The default User group aliases to use for auto-linking users @@ -61,13 +55,7 @@ namespace Umbraco.Web.Security.Identity return _defaultUserGroups; } - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("The default sections are based on the default user group, this is no longer used")] - public string[] GetDefaultAllowedSections(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo) - { - return new string[0]; - } - + private readonly bool _autoLinkExternalAccount; /// diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index 73eeb89936..9816a0caa1 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -59,22 +59,6 @@ namespace Umbraco.Web.Security // used here and there for IMember operations (not front-end stuff, no need for _memberCache) - [Obsolete("Use the constructor specifying an UmbracoContext")] - [EditorBrowsable(EditorBrowsableState.Never)] - public MembershipHelper(HttpContextBase httpContext) - { - if (httpContext == null) throw new ArgumentNullException(nameof(httpContext)); - _httpContext = httpContext; - _membershipProvider = MPE.GetMembersMembershipProvider(); - _roleProvider = Roles.Enabled ? Roles.Provider : new MembersRoleProvider(MemberService); - - // _memberCache remains null - not supposed to use it - // alternatively we'd need to get if from the 'current' UmbracoContext? - - // helpers are *not* instanciated by the container so we have to - // get our dependencies injected manually, through properties. - Current.Container.InjectProperties(this); - } // used everywhere public MembershipHelper(UmbracoContext umbracoContext) diff --git a/src/Umbraco.Web/TagQuery.cs b/src/Umbraco.Web/TagQuery.cs index 7a1dc2115e..9527e72453 100644 --- a/src/Umbraco.Web/TagQuery.cs +++ b/src/Umbraco.Web/TagQuery.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using AutoMapper; -using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Web.Models; @@ -22,20 +21,6 @@ namespace Umbraco.Web private readonly ITagService _tagService; private readonly IPublishedContentQuery _contentQuery; - [Obsolete("Use the alternate constructor specifying the contentQuery instead")] - public TagQuery(ITagService tagService) - : this(tagService, new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache)) - { - } - - [Obsolete("Use the alternate constructor specifying the ITypedPublishedContentQuery instead")] - public TagQuery(ITagService tagService, PublishedContentQuery contentQuery) - { - if (tagService == null) throw new ArgumentNullException("tagService"); - if (contentQuery == null) throw new ArgumentNullException("contentQuery"); - _tagService = tagService; - _contentQuery = contentQuery; - } /// /// Constructor for wrapping ITagQuery, see http://issues.umbraco.org/issue/U4-6899 diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index ca76924b23..2d86253ee2 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -287,7 +287,7 @@ namespace Umbraco.Web #region Membership [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the IsProtected method that only specifies path")] + [Obsolete("Use the IsProtected method that only specifies path. This can be removed when library.cs is removed.")] public bool IsProtected(int documentId, string path) { return IsProtected(path.EnsureEndsWith("," + documentId)); @@ -304,7 +304,7 @@ namespace Umbraco.Web } [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the MemberHasAccess method that only specifies path")] + [Obsolete("Use the MemberHasAccess method that only specifies path. This can be removed when library.cs is removed.")] public bool MemberHasAccess(int nodeId, string path) { return MemberHasAccess(path.EnsureEndsWith("," + nodeId)); diff --git a/src/Umbraco.Web/_Legacy/Packager/data.cs b/src/Umbraco.Web/_Legacy/Packager/data.cs index dd14c54cec..9353d52461 100644 --- a/src/Umbraco.Web/_Legacy/Packager/data.cs +++ b/src/Umbraco.Web/_Legacy/Packager/data.cs @@ -1,8 +1,6 @@ using System; using System.Xml; -using System.Xml.XPath; using System.Collections.Generic; -using System.ComponentModel; using System.IO; using Umbraco.Core; using Umbraco.Core.Configuration; @@ -264,17 +262,6 @@ namespace umbraco.cms.businesslogic.packager } - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("This method is no longer in use and will be removed in the future")] - public static void UpdateValue(XmlNode n, string Value) - { - if (n.FirstChild != null) - n.FirstChild.Value = Value; - else - { - n.AppendChild(Source.CreateTextNode(Value)); - } - } public static void Save(PackageInstance package, string dataSource) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs index e4460bda3a..56f794caa0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs @@ -5,12 +5,9 @@ using System.Xml.Schema; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web.Script.Serialization; -using Umbraco.Core.IO; using Umbraco.Web.Composing; using Umbraco.Web.UI.Pages; using Umbraco.Web._Legacy.Actions; -using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.cms.presentation.Trees { @@ -263,30 +260,7 @@ namespace umbraco.cms.presentation.Trees set { m_nodeType = value; } } - /// - /// Used by the content tree and flagged as true if the node is not published - /// - [Obsolete("Use the XmlTreeNode.NodeStyle object to set node styles")] - public bool? NotPublished - { - get { return m_notPublished; } - set { m_notPublished = value; } - } - /// - /// Used by the content tree and flagged as true if the node is protected - /// - [Obsolete("Use the XmlTreeNode.NodeStyle object to set node styles")] - public bool? IsProtected - { - get { return m_isProtected; } - set - { - m_isProtected = value; - if (m_isProtected.HasValue && m_isProtected.Value) - this.Style.SecureNode(); - } - } /// /// Returns the styling object used to add common styles to a node @@ -353,17 +327,6 @@ namespace umbraco.cms.presentation.Trees } } - /// - /// Dims the color of the node - /// - /// - ///This adds the class to the existing icon class as to not override anything. - /// - [Obsolete("Use XmlTreeNode.Style to style nodes. Example: myNode.Style.DimNode();")] - public void DimNode() - { - this.Style.DimNode(); - } #region IXmlSerializable Members diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs index 3a61f4dd7a..018c49a249 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs @@ -17,18 +17,6 @@ namespace umbraco.controls TreeAlias = "content"; } - [Obsolete("Use Value property instead, this simply wraps it.")] - public string Text - { - get - { - return this.Value; - } - set - { - this.Value = value; - } - } public string AppAlias { get; set; } public string TreeAlias { get; set; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index 62bec41e0f..e498d3326b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -258,11 +258,6 @@ namespace umbraco.presentation.developer.packages } } - [Obsolete("This is not used")] - [EditorBrowsable(EditorBrowsableState.Never)] - protected void generateXML(object sender, EventArgs e) - { - } private void SavePackage(bool showNotification) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index a1a8491716..14b4824171 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -265,17 +265,6 @@ namespace umbraco.presentation.templateControls return FindAttribute(new AttributeCollectionAdapter(Attributes), "recursive") == "true"; } - /// - /// Determines whether field uses the API to lookup the value - /// (if a NodeId attribute is specified and is different from the current page id). - /// - /// true if API lookup is used; otherwise, false. - [Obsolete("Method never implemented", true)] - protected virtual bool FieldIsApiLookup() - { - // TODO: remove false and add security - return false; - } /// /// Gets a value indicating whether the current item is editable by the current user.