From efc2c7019b73bf22a38db734eca63b6161b336b5 Mon Sep 17 00:00:00 2001
From: Marco Rossignoli <marco.rossignoli@gmail.com>
Date: Mon, 13 Aug 2018 21:20:39 +0200
Subject: [PATCH] add corelib helper (dotnet/corefx#31739)

Commit migrated from https://github.com/dotnet/corefx/commit/e62a4bdcd623193c1aa9ad2877c1137b068b3224
---
 .../System.ComponentModel.TypeConverter/src/ILLinkTrim.xml        | 8 ++++++++
 .../src/System/ComponentModel/TypeDescriptor.cs                   | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 src/libraries/System.ComponentModel.TypeConverter/src/ILLinkTrim.xml

diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/ILLinkTrim.xml b/src/libraries/System.ComponentModel.TypeConverter/src/ILLinkTrim.xml
new file mode 100644
index 0000000..6f301ec
--- /dev/null
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/ILLinkTrim.xml
@@ -0,0 +1,8 @@
+<linker>
+  <assembly fullname="System.ComponentModel.TypeConverter">
+    <type fullname="System.ComponentModel.TypeDescriptor">
+      <!-- called through reflection by System.ComponentModel.DefaultValueAttribute -->
+      <method name="ConvertFromInvariantString" />
+    </type>
+  </assembly>
+</linker>
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs
index 550b1a0..457fe34 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/TypeDescriptor.cs
@@ -808,6 +808,12 @@ namespace System.ComponentModel
             return GetDescriptor(type, nameof(type)).GetConverter();
         }
 
+        // This is called by System.ComponentModel.DefaultValueAttribute via reflection.
+        private static object ConvertFromInvariantString(Type type, string stringValue)
+        {
+            return GetConverter(type).ConvertFromInvariantString(stringValue);
+        }
+
         /// <summary>
         /// Gets the default event for the specified type of component.
         /// </summary>
-- 
2.7.4