diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/FieldSettingsExtensions.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/FieldSettingsExtensions.cs deleted file mode 100644 index c81020aa27d..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/FieldSettingsExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using OrchardCore.ContentManagement.Metadata.Builders; - -namespace OrchardCore.ContentFields.Settings -{ - public static class FieldSettingsExtensions - { - [Obsolete("Please migrate to use WithSettings. This will be removed in future versions.")] - public static ContentPartFieldDefinitionBuilder Hint(this ContentPartFieldDefinitionBuilder builder, string hint) - { - return builder.WithSetting(nameof(Hint), hint); - } - } -} diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs index a94a53687fc..f36f6184470 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using Microsoft.AspNetCore.Routing; @@ -6,9 +5,6 @@ namespace OrchardCore.ContentManagement { public class ContentItemMetadata { - [Obsolete("This property will be removed in a future version. Use ContentItem.DisplayText instead.")] - public string DisplayText { get; set; } - public RouteValueDictionary DisplayRouteValues { get; set; } public RouteValueDictionary EditorRouteValues { get; set; } public RouteValueDictionary CreateRouteValues { get; set; } diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs index 810e84f5faf..fdf701420e2 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs @@ -1,4 +1,3 @@ -using System; using System.Threading.Tasks; namespace OrchardCore.ContentManagement @@ -7,7 +6,4 @@ public interface IContentHandleManager { Task GetContentItemIdAsync(string handle); } - - [Obsolete("This interface has been renamed to IContentHandleManager")] - public interface IContentAliasManager { } } diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs index 8a227601a68..1540baf3d2d 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs @@ -77,14 +77,6 @@ public ContentPartDefinitionBuilder RemoveField(string fieldName) return this; } - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentPartDefinitionBuilder WithSetting(string name, string value) - { - _settings[name] = value; - - return this; - } - public ContentPartDefinitionBuilder MergeSettings(JObject settings) { _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings); diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs index dbc4a8ab1bd..3b1ca9f146d 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs @@ -20,33 +20,12 @@ protected ContentPartFieldDefinitionBuilder(ContentPartFieldDefinition field) _settings = new JObject(field.Settings); } - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentPartFieldDefinitionBuilder WithSetting(string name, string value) - { - _settings[name] = value; - return this; - } - - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentPartFieldDefinitionBuilder WithSetting(string name, string[] values) - { - _settings[name] = new JArray(values); - return this; - } - public ContentPartFieldDefinitionBuilder MergeSettings(JObject settings) { _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings); return this; } - [Obsolete("Use MergeSettings. This will be removed in a future version.")] - public ContentPartFieldDefinitionBuilder MergeSettings(object model) - { - _settings.Merge(JObject.FromObject(model), ContentBuilderSettings.JsonMergeSettings); - return this; - } - public ContentPartFieldDefinitionBuilder MergeSettings(Action setting) where T : class, new() { var existingJObject = _settings[typeof(T).Name] as JObject; diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs index 47594d7b313..b57d3798b11 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs @@ -70,13 +70,6 @@ public ContentTypeDefinitionBuilder DisplayedAs(string displayName) return this; } - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentTypeDefinitionBuilder WithSetting(string name, object value) - { - _settings[name] = JToken.FromObject(value); - return this; - } - public ContentTypeDefinitionBuilder MergeSettings(JObject settings) { _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings); diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs index 787bdef5bac..050af70dbdc 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs @@ -35,20 +35,6 @@ public ContentTypePartDefinitionBuilder WithSettings(T settings) return this; } - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentTypePartDefinitionBuilder WithSetting(string name, string value) - { - _settings[name] = value; - return this; - } - - [Obsolete("Use WithSettings. This will be removed in a future version.")] - public ContentTypePartDefinitionBuilder WithSetting(string name, string[] values) - { - _settings[name] = new JArray(values); - return this; - } - public ContentTypePartDefinitionBuilder MergeSettings(JObject settings) { _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings); diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/MetaDataExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/MetaDataExtensions.cs deleted file mode 100644 index 77ce5b15cca..00000000000 --- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/MetaDataExtensions.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace OrchardCore.ContentManagement.Metadata.Models -{ - public static class MetaDataExtensions - { - /// - /// Populates an object with the values from a instance. - /// - /// - /// - [Obsolete("Migrate to PopulateSettings. This will be removed in a future version.")] - public static void Populate(this JObject settings, object target) - { - JsonConvert.PopulateObject(settings.ToString(), target); - } - - [Obsolete("Migrate to PopulateSettings. This will be removed in a future version.")] - public static void Populate(this JObject settings, object target) - { - var property = settings[typeof(T).Name]; - - if (property != null) - { - JsonConvert.PopulateObject(property.ToString(), target); - } - } - } -}