diff --git a/eng/generators.targets b/eng/generators.targets
index e7835650b04ec..80e6e8f228e04 100644
--- a/eng/generators.targets
+++ b/eng/generators.targets
@@ -61,6 +61,19 @@
and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))))" Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\ArrayMarshaller.cs" />
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index 57e9c3e55cfe2..4edd3ba2b70fd 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -4,6 +4,7 @@
true
$(NetCoreAppCurrent)
enable
+ true
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerVerb.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerVerb.cs
index d74d5d6d5aa46..a51627d774d97 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerVerb.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerVerb.cs
@@ -9,15 +9,12 @@ namespace System.ComponentModel.Design
///
/// Represents a verb that can be executed by a component's designer.
///
- public class DesignerVerb : MenuCommand
+ public partial class DesignerVerb : MenuCommand
{
///
/// Initializes a new instance of the class.
///
- public DesignerVerb(string text, EventHandler handler) : base(handler, StandardCommands.VerbFirst)
- {
- Properties["Text"] = text == null ? null : Regex.Replace(text, @"\(\&.\)", "");
- }
+ public DesignerVerb(string text, EventHandler handler) : this(text, handler, StandardCommands.VerbFirst) { }
///
/// Initializes a new instance of the
@@ -25,9 +22,12 @@ public DesignerVerb(string text, EventHandler handler) : base(handler, StandardC
///
public DesignerVerb(string text, EventHandler handler, CommandID startCommandID) : base(handler, startCommandID)
{
- Properties["Text"] = text == null ? null : Regex.Replace(text, @"\(\&.\)", "");
+ Properties["Text"] = text == null ? null : GetParameterReplacementRegex().Replace(text, "");
}
+ [RegexGenerator(@"\(\&.\)")]
+ private static partial Regex GetParameterReplacementRegex();
+
///
/// Gets or sets the description of the menu item for the verb.
///