Skip to content

Commit

Permalink
Remove code marked obsolete for more than two years (#12955)
Browse files Browse the repository at this point in the history
  • Loading branch information
TFleury authored Jan 22, 2024
1 parent 834436d commit da845ea
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 103 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Routing;

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; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Threading.Tasks;

namespace OrchardCore.ContentManagement
Expand All @@ -7,7 +6,4 @@ public interface IContentHandleManager
{
Task<string> GetContentItemIdAsync(string handle);
}

[Obsolete("This interface has been renamed to IContentHandleManager")]
public interface IContentAliasManager { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ public ContentPartDefinitionBuilder RemoveField(string fieldName)
return this;
}

[Obsolete("Use WithSettings<T>. 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,12 @@ protected ContentPartFieldDefinitionBuilder(ContentPartFieldDefinition field)
_settings = new JObject(field.Settings);
}

[Obsolete("Use WithSettings<T>. This will be removed in a future version.")]
public ContentPartFieldDefinitionBuilder WithSetting(string name, string value)
{
_settings[name] = value;
return this;
}

[Obsolete("Use WithSettings<T>. 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<T>. 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<T>(Action<T> setting) where T : class, new()
{
var existingJObject = _settings[typeof(T).Name] as JObject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ public ContentTypeDefinitionBuilder DisplayedAs(string displayName)
return this;
}

[Obsolete("Use WithSettings<T>. 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@ public ContentTypePartDefinitionBuilder WithSettings<T>(T settings)
return this;
}

[Obsolete("Use WithSettings<T>. This will be removed in a future version.")]
public ContentTypePartDefinitionBuilder WithSetting(string name, string value)
{
_settings[name] = value;
return this;
}

[Obsolete("Use WithSettings<T>. 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);
Expand Down

This file was deleted.

0 comments on commit da845ea

Please sign in to comment.