Skip to content

Fix case of DefaultValue using enum backing type. #55793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericstj merged 1 commit into from
Jul 16, 2021
Merged

Fix case of DefaultValue using enum backing type. #55793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ystem.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private object DefaultValue
object? defaultValue = ((DefaultValueAttribute)a).Value;
bool storedAsUnderlyingType = defaultValue != null && PropertyType.IsEnum && PropertyType.GetEnumUnderlyingType() == defaultValue.GetType();
_defaultValue = storedAsUnderlyingType ?
Enum.ToObject(PropertyType, _defaultValue!) :
Enum.ToObject(PropertyType, defaultValue!) :
defaultValue;
}
else
Expand Down
9 changes: 9 additions & 0 deletions src/libraries/System.ComponentModel.TypeConverter/tests/DescriptorTestComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

namespace System.ComponentModel.Tests
{
internal enum DescriptorTestEnum
{
Value0 = 0,
Value1 = 1
}

internal class DescriptorTestComponent : IComponent, ISite
{
private Dictionary<Type, object> _services;
Expand All @@ -17,6 +23,9 @@ internal class DescriptorTestComponent : IComponent, ISite
[DefaultValue(DefaultPropertyValue)]
public int Property { get; set; }

[DefaultValue(0)]
public DescriptorTestEnum EnumProperty { get; set; }

public object PropertyWhichThrows { get { throw new NotImplementedException(); } }

public string StringProperty { get; private set; }
Expand Down
11 changes: 11 additions & 0 deletions src/libraries/System.ComponentModel.TypeConverter/tests/PropertyDescriptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,17 @@ public void ShouldSerializeValueReturnsTrueWhenValueIsNotDefault()
Assert.True(propertyDescriptor.ShouldSerializeValue(component));
}

[Fact]
public void ShouldSerializeValueHandlesEnumWithBackingTypeDefaultValue()
{
var component = new DescriptorTestComponent();
component.EnumProperty = DescriptorTestEnum.Value1;
var properties = TypeDescriptor.GetProperties(component.GetType());
PropertyDescriptor propertyDescriptor = properties.Find(nameof(component.EnumProperty), false);

Assert.True(propertyDescriptor.ShouldSerializeValue(component));
}

[Fact]
public static void ReadOnlyPropertyReturnsTrue()
{
Expand Down