Add JsonEnumMemberNameAttribute.

src/libraries/System.Text.Json/ref/System.Text.Json.cs

@@ -1164,6 +1164,12 @@ public JsonStringEnumConverter(System.Text.Json.JsonNamingPolicy? namingPolicy =
  public sealed override bool CanConvert(System.Type typeToConvert) { throw null; }
  public sealed override System.Text.Json.Serialization.JsonConverter CreateConverter(System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) { throw null; }
  }
+ [System.AttributeUsageAttribute(System.AttributeTargets.Field, AllowMultiple=false)]
+ public partial class JsonStringEnumMemberNameAttribute : System.Attribute
+ {
+ public JsonStringEnumMemberNameAttribute(string name) { }
+ public string Name { get { throw null; } }
+ }
  public enum JsonUnknownDerivedTypeHandling
  {
  FailSerialization = 0,

src/libraries/System.Text.Json/src/Resources/Strings.resx

@@ -231,8 +231,8 @@
  <data name="InvalidCharacterWithinString" xml:space="preserve">
  <value>'{0}' is invalid within a JSON string. The string should be correctly escaped.</value>
  </data>
- <data name="InvalidEnumTypeWithSpecialChar" xml:space="preserve">
- <value>Enum type '{0}' uses unsupported identifer name '{1}'.</value>
+ <data name="UnsupportedEnumIdentifier" xml:space="preserve">
+ <value>Enum type '{0}' uses unsupported identifier '{1}'. It must not be null, empty, or containing leading or trailing whitespace. Flags enums must additionally not contain commas.</value>
  </data>
  <data name="InvalidEndOfJsonNonPrimitive" xml:space="preserve">
  <value>'{0}' is an invalid token type for the end of the JSON payload. Expected either 'EndArray' or 'EndObject'.</value>

src/libraries/System.Text.Json/src/System.Text.Json.csproj

@@ -266,6 +266,7 @@ The System.Text.Json library is built-in as part of the shared framework in .NET
  <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.Converters.cs" />
  <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.cs" />
  <Compile Include="System\Text\Json\Serialization\JsonStringEnumConverter.cs" />
+ <Compile Include="System\Text\Json\Serialization\JsonStringEnumMemberNameAttribute.cs" />
  <Compile Include="System\Text\Json\Serialization\Metadata\FSharpCoreReflectionProxy.cs" />
  <Compile Include="System\Text\Json\Serialization\Metadata\JsonCollectionInfoValuesOfTCollection.cs" />
  <Compile Include="System\Text\Json\Serialization\Metadata\JsonMetadataServices.Collections.cs" />

src/libraries/System.Text.Json/src/System/ReflectionExtensions.cs

@@ -95,11 +95,11 @@ private static bool HasCustomAttributeWithName(this MemberInfo memberInfo, strin
  /// Polyfill for BindingFlags.DoNotWrapExceptions
  /// </summary>
  public static object? CreateInstanceNoWrapExceptions(
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.NonPublicConstructors)] this Type type,
+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] this Type type,
  Type[] parameterTypes,
  object?[] parameters)
  {
- ConstructorInfo ctorInfo = type.GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, parameterTypes, null)!;
+ ConstructorInfo ctorInfo = type.GetConstructor(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null, parameterTypes, null)!;
 #if NET
  return ctorInfo.Invoke(BindingFlags.DoNotWrapExceptions, null, parameters, null);
 #else

src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.cs

@@ -317,7 +317,7 @@ public static bool HasAllSet(this BitArray bitArray)
  /// Gets a Regex instance for recognizing integer representations of enums.
  /// </summary>
  public static readonly Regex IntegerRegex = CreateIntegerRegex();
- private const string IntegerRegexPattern = @"^\s*(\+|\-)?[0-9]+\s*$";
+ private const string IntegerRegexPattern = @"^\s*(?:\+|\-)?[0-9]+\s*$";
  private const int IntegerRegexTimeoutMs = 200;
 
 #if NET
@@ -570,5 +570,52 @@ static int IndexOfFirstTrailingZero(ReadOnlySpan<byte> span)
  }
  }
  }
+
+#if !NET
+ // Polyfill for MemoryExtensions.Trim
+ public static ReadOnlySpan<char> Trim(this ReadOnlySpan<char> source)
+ {
+ int start = 0;
+ int end = source.Length - 1;
+
+ while (start <= end && char.IsWhiteSpace(source[start]))
+ {
+ start++;
+ }
+
+ while (end >= start && char.IsWhiteSpace(source[end]))
+ {
+ end--;
+ }
+
+ return source.Slice(start, end - start + 1);
+ }
+
+ public static ReadOnlySpan<char> TrimStart(this ReadOnlySpan<char> source)
+ {
+ int start = 0;
+ int end = source.Length - 1;
+
+ while (start <= end && char.IsWhiteSpace(source[start]))
+ {
+ start++;
+ }
+
+ return source.Slice(start, end - start + 1);
+ }
+
+ public static ReadOnlySpan<char> TrimEnd(this ReadOnlySpan<char> source)
+ {
+ int start = 0;
+ int end = source.Length - 1;
+
+ while (end >= start && char.IsWhiteSpace(source[end]))
+ {
+ end--;
+ }
+
+ return source.Slice(start, end - start + 1);
+ }
+#endif
  }
 }