diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 5e1c088822..a1a46e71c6 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -20,7 +20,7 @@ the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do not want this to happen as the alpha of the next major is, really, the next major already. --> - + diff --git a/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs b/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs index c58bb409b0..ff335434ab 100644 --- a/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs +++ b/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs @@ -46,19 +46,6 @@ namespace Umbraco.Core.Auditing /// public string Username { get; private set; } - [Obsolete("Use the method that has the affectedUser parameter instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser = -1) - { - DateTimeUtc = DateTime.UtcNow; - Action = action; - - IpAddress = ipAddress; - - PerformingUser = performingUser == -1 - ? GetCurrentRequestBackofficeUserId() - : performingUser; - } /// /// Default constructor diff --git a/src/Umbraco.Core/Cache/CacheHelper.cs b/src/Umbraco.Core/Cache/CacheHelper.cs index a85285e427..f99b1e847b 100644 --- a/src/Umbraco.Core/Cache/CacheHelper.cs +++ b/src/Umbraco.Core/Cache/CacheHelper.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Web; -using System.Web.Caching; namespace Umbraco.Core.Cache { @@ -53,15 +50,6 @@ namespace Umbraco.Core.Cache { } - [Obsolete("Use the constructor the specifies all dependencies")] - [EditorBrowsable(EditorBrowsableState.Never)] - public CacheHelper( - IRuntimeCacheProvider httpCacheProvider, - ICacheProvider staticCacheProvider, - ICacheProvider requestCacheProvider) - : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider())) - { - } /// /// Initializes a new instance based on the provided providers @@ -106,317 +94,6 @@ namespace Umbraco.Core.Cache /// public IsolatedRuntimeCache IsolatedRuntimeCache { get; internal set; } - #region Legacy Runtime/Http Cache accessors - - /// - /// Clears the item in umbraco's runtime cache - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearAllCache() - { - RuntimeCache.ClearAllCache(); - IsolatedRuntimeCache.ClearAllCaches(); - } - - /// - /// Clears the item in umbraco's runtime cache with the given key - /// - /// Key - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearCacheItem(string key) - { - RuntimeCache.ClearCacheItem(key); - } - - - /// - /// Clears all objects in the System.Web.Cache with the System.Type name as the - /// input parameter. (using [object].GetType()) - /// - /// The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument" - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - public void ClearCacheObjectTypes(string typeName) - { - RuntimeCache.ClearCacheObjectTypes(typeName); - } - - /// - /// Clears all objects in the System.Web.Cache with the System.Type specified - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearCacheObjectTypes() - { - RuntimeCache.ClearCacheObjectTypes(); - } - - /// - /// Clears all cache items that starts with the key passed. - /// - /// The start of the key - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearCacheByKeySearch(string keyStartsWith) - { - RuntimeCache.ClearCacheByKeySearch(keyStartsWith); - } - - /// - /// Clears all cache items that have a key that matches the regular expression - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearCacheByKeyExpression(string regexString) - { - RuntimeCache.ClearCacheByKeyExpression(regexString); - } - - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public IEnumerable GetCacheItemsByKeySearch(string keyStartsWith) - { - return RuntimeCache.GetCacheItemsByKeySearch(keyStartsWith); - } - - /// - /// Returns a cache item by key, does not update the cache if it isn't there. - /// - /// - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public TT GetCacheItem(string cacheKey) - { - return RuntimeCache.GetCacheItem(cacheKey); - } - - /// - /// Gets (and adds if necessary) an item from the cache with all of the default parameters - /// - /// - /// - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public TT GetCacheItem(string cacheKey, Func getCacheItem) - { - return RuntimeCache.GetCacheItem(cacheKey, getCacheItem); - - } - - /// - /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW) - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public TT GetCacheItem(string cacheKey, - TimeSpan timeout, Func getCacheItem) - { - return RuntimeCache.GetCacheItem(cacheKey, getCacheItem, timeout); - - } - - /// - /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW) - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public TT GetCacheItem(string cacheKey, - CacheItemRemovedCallback refreshAction, TimeSpan timeout, - Func getCacheItem) - { - return RuntimeCache.GetCacheItem(cacheKey, getCacheItem, timeout, removedCallback: refreshAction); - - } - - /// - /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW) - /// - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public TT GetCacheItem(string cacheKey, - CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout, - Func getCacheItem) - { - return RuntimeCache.GetCacheItem(cacheKey, getCacheItem, timeout, false, priority, refreshAction); - - } - - /// - /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW) - /// - /// - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - /// - [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")] - public TT GetCacheItem(string cacheKey, - CacheItemPriority priority, - CacheItemRemovedCallback refreshAction, - CacheDependency cacheDependency, - TimeSpan timeout, - Func getCacheItem) - { - var cache = GetHttpRuntimeCacheProvider(RuntimeCache); - if (cache != null) - { - var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency); - return result == null ? default(TT) : result.TryConvertTo().Result; - } - throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider)); - } - - /// - /// Gets (and adds if necessary) an item from the cache - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")] - public TT GetCacheItem(string cacheKey, - CacheItemPriority priority, - CacheDependency cacheDependency, - Func getCacheItem) - { - var cache = GetHttpRuntimeCacheProvider(RuntimeCache); - if (cache != null) - { - var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency); - return result == null ? default(TT) : result.TryConvertTo().Result; - } - throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider)); - } - - /// - /// Inserts an item into the cache, if it already exists in the cache it will be replaced - /// - /// - /// - /// - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void InsertCacheItem(string cacheKey, - CacheItemPriority priority, - Func getCacheItem) - { - RuntimeCache.InsertCacheItem(cacheKey, getCacheItem, priority: priority); - - } - - /// - /// Inserts an item into the cache, if it already exists in the cache it will be replaced - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")] - [EditorBrowsable(EditorBrowsableState.Never)] - public void InsertCacheItem(string cacheKey, - CacheItemPriority priority, - TimeSpan timeout, - Func getCacheItem) - { - RuntimeCache.InsertCacheItem(cacheKey, getCacheItem, timeout, priority: priority); - } - - /// - /// Inserts an item into the cache, if it already exists in the cache it will be replaced - /// - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")] - public void InsertCacheItem(string cacheKey, - CacheItemPriority priority, - CacheDependency cacheDependency, - TimeSpan timeout, - Func getCacheItem) - { - var cache = GetHttpRuntimeCacheProvider(RuntimeCache); - if (cache != null) - { - cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency); - } - throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider)); - } - - /// - /// Inserts an item into the cache, if it already exists in the cache it will be replaced - /// - /// - /// - /// - /// - /// - /// This will set an absolute expiration from now until the timeout - /// - [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")] - public void InsertCacheItem(string cacheKey, - CacheItemPriority priority, - CacheItemRemovedCallback refreshAction, - CacheDependency cacheDependency, - TimeSpan? timeout, - Func getCacheItem) - { - var cache = GetHttpRuntimeCacheProvider(RuntimeCache); - if (cache != null) - { - cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency); - } - throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider)); - } - #endregion - - private HttpRuntimeCacheProvider GetHttpRuntimeCacheProvider(IRuntimeCacheProvider runtimeCache) - { - HttpRuntimeCacheProvider cache; - var wrapper = RuntimeCache as IRuntimeCacheProviderWrapper; - if (wrapper != null) - { - cache = wrapper.InnerProvider as HttpRuntimeCacheProvider; - } - else - { - cache = RuntimeCache as HttpRuntimeCacheProvider; - } - return cache; - } } } diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs index 1058fa6181..e7dcf7cd8c 100644 --- a/src/Umbraco.Core/Cache/CacheKeys.cs +++ b/src/Umbraco.Core/Cache/CacheKeys.cs @@ -1,6 +1,4 @@ -using System; -using System.ComponentModel; -using Umbraco.Core.CodeAnnotations; +using Umbraco.Core.CodeAnnotations; namespace Umbraco.Core.Cache { @@ -12,14 +10,6 @@ namespace Umbraco.Core.Cache public const string ApplicationTreeCacheKey = "ApplicationTreeCache"; public const string ApplicationsCacheKey = "ApplicationCache"; - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string UserTypeCacheKey = "UserTypeCache"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future - it is referenced but no cache is stored against this key")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string ContentItemCacheKey = "contentItem"; - [UmbracoWillObsolete("This cache key is only used for the legacy 'library' caching, remove in v8")] public const string MediaCacheKey = "UL_GetMedia"; diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs index ed3e7d682c..524ae580a3 100644 --- a/src/Umbraco.Core/Constants-Conventions.cs +++ b/src/Umbraco.Core/Constants-Conventions.cs @@ -26,18 +26,8 @@ namespace Umbraco.Core [Obsolete("No longer supported, this is here for backwards compatibility only")] public const string MemberIdRuleType = "MemberId"; - [Obsolete("No longer supported, this is here for backwards compatibility only")] - public const string MemberGroupIdRuleType = "MemberGroupId"; } - public static class Localization - { - /// - /// The root id for all top level dictionary items - /// - [Obsolete("There is no dictionary root item id anymore, it is simply null")] - public const string DictionaryItemRootId = "41c7638d-f529-4bff-853e-59a0c2fb1bde"; - } public static class DataTypes { diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs index fb629d382e..790c143bbf 100644 --- a/src/Umbraco.Core/Constants-ObjectTypes.cs +++ b/src/Umbraco.Core/Constants-ObjectTypes.cs @@ -127,11 +127,6 @@ namespace Umbraco.Core public static readonly Guid ContentItem = new Guid(Strings.ContentItem); - [Obsolete("This no longer exists in the database")] - internal static readonly Guid Stylesheet = new Guid(Strings.Stylesheet); - - [Obsolete("This no longer exists in the database")] - internal static readonly Guid StylesheetProperty = new Guid(Strings.StylesheetProperty); } } } diff --git a/src/Umbraco.Core/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs index 29483e5e01..aaeddc6921 100644 --- a/src/Umbraco.Core/Events/MoveEventArgs.cs +++ b/src/Umbraco.Core/Events/MoveEventArgs.cs @@ -88,15 +88,6 @@ namespace Umbraco.Core.Events EventObject = moveInfo.First().Entity; } - [Obsolete("Use the overload that specifies the MoveEventInfo object")] - public MoveEventArgs(TEntity eventObject, bool canCancel, int parentId) - : base(eventObject, canCancel) - { } - - [Obsolete("Use the overload that specifies the MoveEventInfo object")] - public MoveEventArgs(TEntity eventObject, int parentId) - : base(eventObject) - { } /// /// Gets all MoveEventInfo objects used to create the object @@ -119,15 +110,6 @@ namespace Umbraco.Core.Events } } - /// - /// The entity being moved - /// - [Obsolete("Retrieve the entity object from the MoveInfoCollection property instead")] - public TEntity Entity - { - get { return EventObject; } - } - public bool Equals(MoveEventArgs other) { if (other is null) return false; diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index 2c013e9b90..d8eb900bb2 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/src/Umbraco.Core/Models/ContentExtensions.cs @@ -5,13 +5,10 @@ using System.IO; using System.Linq; using System.Web; using System.Xml.Linq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Models.Entities; using Umbraco.Core.Models.Membership; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; @@ -98,12 +95,6 @@ namespace Umbraco.Core.Models return mediaService.GetAncestors(media); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Ancestors(this IMedia media) - { - return Current.Services.MediaService.GetAncestors(media); - } /// /// Returns a list of the current medias children. @@ -116,12 +107,6 @@ namespace Umbraco.Core.Models return mediaService.GetChildren(media.Id); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Children(this IMedia media) - { - return Current.Services.MediaService.GetChildren(media.Id); - } /// /// Returns a list of the current medias descendants, not including the media itself. @@ -134,12 +119,6 @@ namespace Umbraco.Core.Models return mediaService.GetDescendants(media); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IEnumerable Descendants(this IMedia media) - { - return Current.Services.MediaService.GetDescendants(media); - } /// /// Returns the parent of the current media. @@ -152,12 +131,6 @@ namespace Umbraco.Core.Models return mediaService.GetById(media.ParentId); } - [Obsolete("Use the overload with the service reference instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IMedia Parent(this IMedia media) - { - return Current.Services.MediaService.GetById(media.ParentId); - } #endregion /// @@ -339,14 +312,6 @@ namespace Umbraco.Core.Models #region User/Profile methods - - [Obsolete("Use the overload that declares the IUserService to use")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static IProfile GetCreatorProfile(this IMedia media) - { - return Current.Services.UserService.GetProfileById(media.CreatorId); - } - /// /// Gets the for the Creator of this media item. /// @@ -454,13 +419,6 @@ namespace Umbraco.Core.Models return packagingService.Export(media, true, raiseEvents: false); } - [Obsolete("Use the overload that declares the IPackagingService to use")] - public static XElement ToXml(this IContent content, bool isPreview) - { - //TODO Do a proper implementation of this - //If current IContent is published we should get latest unpublished version - return content.ToXml(); - } /// /// Creates the xml representation for the object @@ -476,11 +434,6 @@ namespace Umbraco.Core.Models return content.ToXml(packagingService); } - [Obsolete("Use the overload that declares the IPackagingService to use")] - public static XElement ToXml(this IMember member) - { - return ((PackagingService)(Current.Services.PackagingService)).Export(member); - } /// /// Creates the xml representation for the object diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs index 4a39166dc8..196c68b23c 100644 --- a/src/Umbraco.Core/Models/ContentType.cs +++ b/src/Umbraco.Core/Models/ContentType.cs @@ -29,15 +29,6 @@ namespace Umbraco.Core.Models _allowedTemplates = new List(); } - /// - /// Constuctor for creating a ContentType with the parent as an inherited type. - /// - /// Use this to ensure inheritance from parent. - /// - [Obsolete("This method is obsolete, use ContentType(IContentType parent, string alias) instead.", false)] - public ContentType(IContentType parent) : this(parent, null) - { - } /// /// Constuctor for creating a ContentType with the parent as an inherited type. diff --git a/src/Umbraco.Core/Models/ContentTypeSort.cs b/src/Umbraco.Core/Models/ContentTypeSort.cs index 000d80777c..e9442ed4c6 100644 --- a/src/Umbraco.Core/Models/ContentTypeSort.cs +++ b/src/Umbraco.Core/Models/ContentTypeSort.cs @@ -8,10 +8,8 @@ namespace Umbraco.Core.Models /// public class ContentTypeSort : IValueObject, IDeepCloneable { - [Obsolete("This parameterless constructor should never be used")] - public ContentTypeSort() - { - } + // this parameterless ctor should never be used BUT is required by AutoMapper in EntityMapperProfile + internal ContentTypeSort() { } /// /// Initializes a new instance of the class. diff --git a/src/Umbraco.Core/Models/ContentVariation.cs b/src/Umbraco.Core/Models/ContentVariation.cs index 486f0e54f2..c122f0b114 100644 --- a/src/Umbraco.Core/Models/ContentVariation.cs +++ b/src/Umbraco.Core/Models/ContentVariation.cs @@ -11,7 +11,6 @@ namespace Umbraco.Core.Models /// be available or not, and published or not, individually. Varying by segment /// is a property-level thing. /// - [Flags] public enum ContentVariation : byte { /// diff --git a/src/Umbraco.Core/Models/PartialView.cs b/src/Umbraco.Core/Models/PartialView.cs index 73ae8d83dd..a0b32baecf 100644 --- a/src/Umbraco.Core/Models/PartialView.cs +++ b/src/Umbraco.Core/Models/PartialView.cs @@ -10,11 +10,6 @@ namespace Umbraco.Core.Models [DataContract(IsReference = true)] public class PartialView : File, IPartialView { - [Obsolete("Use the ctor that explicitely sets the view type.")] - public PartialView(string path) - : this(PartialViewType.PartialView, path, null) - { } - public PartialView(PartialViewType viewType, string path) : this(viewType, path, null) { } diff --git a/src/Umbraco.Core/Security/EmailService.cs b/src/Umbraco.Core/Security/EmailService.cs index f6e32409cf..e6454544ab 100644 --- a/src/Umbraco.Core/Security/EmailService.cs +++ b/src/Umbraco.Core/Security/EmailService.cs @@ -21,12 +21,6 @@ namespace Umbraco.Core.Security _defaultEmailSender = defaultEmailSender; } - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the constructor specifying all dependencies")] - public EmailService() - : this(UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress, new EmailSender()) - { - } public async Task SendAsync(IdentityMessage message) { diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index 0799c2c9a8..aa7075f418 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -693,13 +693,6 @@ namespace Umbraco.Core return s.LastIndexOf(value, StringComparison.OrdinalIgnoreCase); } - [Obsolete("Use Guid.TryParse instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static bool IsGuid(this string str, bool withHyphens) - { - Guid g; - return Guid.TryParse(str, out g); - } /// /// Tries to parse a string into the supplied type by finding and using the Type's "Parse" method diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 1f78f168ad..afe3dc9c38 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -57,7 +57,7 @@ - + diff --git a/src/Umbraco.Examine/LoggingLevel.cs b/src/Umbraco.Examine/LoggingLevel.cs deleted file mode 100644 index 7ab8fbfad8..0000000000 --- a/src/Umbraco.Examine/LoggingLevel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Umbraco.Examine -{ - [Obsolete("This object is no longer used since we support the log levels that are available with LogHelper")] - public enum LoggingLevel - { - Verbose, Normal - } -} diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index 1621f8ade2..1771ca4d2b 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -61,7 +61,6 @@ - diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 45ff5d70f6..fc70e6ae9e 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -75,7 +75,7 @@ - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7ee98a4c12..eb634e3f88 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -83,7 +83,7 @@ - + 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/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs deleted file mode 100644 index 7d6c887d4a..0000000000 --- a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.ComponentModel; -using System.Web; - -namespace Umbraco.Web.Media.EmbedProviders -{ - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("This is no longer used and will be removed from the codebase in the future, for Flickr, use the Umbraco.Web.Media.EmbedProviders.OEmbedPhoto provider")] - public class Flickr : AbstractOEmbedProvider - { - public override string GetMarkup(string url, int maxWidth, int maxHeight) - { - var flickrUrl = BuildFullUrl(url, maxWidth, maxHeight); - var doc = GetXmlResponse(flickrUrl); - - string imageUrl = doc.SelectSingleNode("/oembed/url").InnerText; - string imageWidth = doc.SelectSingleNode("/oembed/width").InnerText; - string imageHeight = doc.SelectSingleNode("/oembed/height").InnerText; - string imageTitle = doc.SelectSingleNode("/oembed/title").InnerText; - - return string.Format("\"{3}\"", - imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle)); - } - } -} 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..ae4becc7cf 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 @@ -24,27 +21,11 @@ namespace Umbraco.Web.Models MacroAlias = macroAlias; 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 47c34eef1f..ec96f3a3ae 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-Za-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[A-Za-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?\.)+[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-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/Security/Identity/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs index 1526cfb2a1..fd074b9e96 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,6 @@ 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/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 4bb62128b1..cc8f6608c9 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -58,7 +58,7 @@ - + @@ -498,7 +498,6 @@ - @@ -1291,9 +1290,6 @@ SendPublish.aspx - - Code - editPackage.aspx ASPXCodeBehind diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index e83d5adaea..2bc25bb97c 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -299,30 +299,6 @@ namespace Umbraco.Web #region Membership - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the IsProtected method that only specifies path")] - public bool IsProtected(int documentId, string path) - { - return IsProtected(path.EnsureEndsWith("," + documentId)); - } - - /// - /// Check if a document object is protected by the "Protect Pages" functionality in umbraco - /// - /// The full path of the document object to check - /// True if the document object is protected - public bool IsProtected(string path) - { - return MembershipHelper.IsProtected(path); - } - - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete("Use the MemberHasAccess method that only specifies path")] - public bool MemberHasAccess(int nodeId, string path) - { - return MemberHasAccess(path.EnsureEndsWith("," + nodeId)); - } - /// /// Check if the current user has access to a document /// @@ -908,7 +884,7 @@ namespace Umbraco.Web { return StringUtilities.ReplaceLineBreaksForHtml(text); } - + /// /// Generates a hash based on the text string passed in. This method will detect the /// security requirements (is FIPS enabled) and return an appropriate hash. @@ -1073,7 +1049,7 @@ namespace Umbraco.Web } #endregion - + /// /// This is used in methods like BeginUmbracoForm and SurfaceAction to generate an encrypted string which gets submitted in a request for which /// Umbraco can decrypt during the routing process in order to delegate the request to a specific MVC Controller. 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/create/dialogHandler_temp.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs deleted file mode 100644 index de494494f5..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Web; -using Umbraco.Web.UI; -using Umbraco.Web; -using Umbraco.Web._Legacy.UI; - -namespace umbraco.presentation.create -{ - /// - /// Summary description for dialogHandler_temp. - /// - [Obsolete("This class is no longer used, it has been replaced by Umbraco.Web.UI.LegacyDialogHandler which will also eventually be deprecated")] - public class dialogHandler_temp - { - public static void Delete(string NodeType, int NodeId) - { - Delete(NodeType, NodeId, ""); - } - public static void Delete(string NodeType, int NodeId, string Text) - { - LegacyDialogHandler.Delete( - new HttpContextWrapper(HttpContext.Current), - UmbracoContext.Current.Security.CurrentUser, - NodeType, NodeId, Text); - } - - public static string Create(string NodeType, int NodeId, string Text) - { - return Create(NodeType, 0, NodeId, Text); - } - - public static string Create(string NodeType, int TypeId, int NodeId, string Text) - { - return LegacyDialogHandler.Create( - new HttpContextWrapper(HttpContext.Current), - UmbracoContext.Current.Security.CurrentUser, - NodeType, NodeId, Text, TypeId); - } - } -} 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.