Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

Add TypeConverter fallback to DefaultValueAttribute #235

Merged
merged 3 commits into from
Jan 17, 2019

Conversation

MaximLipnin
Copy link

…9354)

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
@marek-safar
Copy link
Member

@MaximLipnin that won't compile with mcs :-(

@@ -36,7 +36,24 @@ public DefaultValueAttribute(Type type, string value)
// load an otherwise normal class.
try
{
if (type.IsSubclassOf(typeof(Enum)))
#if MONO
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change this to __MonoCS__ which is mcs specific define

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@marek-safar marek-safar merged commit b5f6e2e into mono:master Jan 17, 2019
@MaximLipnin MaximLipnin deleted the port_19354_from_upstream branch January 17, 2019 10:45
marek-safar pushed a commit to mono/mono that referenced this pull request Jan 18, 2019
marek-safar pushed a commit that referenced this pull request Jan 18, 2019
* Add TypeConverter fallback to DefaultValueAttribute (dotnet/coreclr#19354)

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

* Workaround for mcs

* Use mcs specific define
marek-safar pushed a commit that referenced this pull request Jan 18, 2019
* Add TypeConverter fallback to DefaultValueAttribute (dotnet/coreclr#19354)

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

* Workaround for mcs

* Use mcs specific define
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants