From de4edf25e1a7d9e3d90b6013513d48281afab0cc Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:42:08 +0000 Subject: [PATCH 01/11] Initial plan From 939435b618a519559a6b94c0feec3fcc9ff07ac1 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:48:11 +0000 Subject: [PATCH 02/11] fix(csharp): Pascal-case extensible enum members Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/EnumProvider.cs | 5 ++++- .../src/Providers/ExtensibleEnumProvider.cs | 16 +++++++++++++- .../EnumProviders/EnumProviderTests.cs | 21 +++++++++++-------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index 74e1679a7b2..64c1453d3e7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -159,7 +159,7 @@ private protected string[] GetGeneratedValueNames( continue; } - var normalizedName = name.NormalizeCSharpAcronyms(); + var normalizedName = NormalizeValueName(inputValues[i].Name, name); normalizedNames[i] = lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName) ? name : normalizedName; @@ -167,6 +167,9 @@ private protected string[] GetGeneratedValueNames( return normalizedNames; } + private protected virtual string NormalizeValueName(string inputName, string generatedName) => + generatedName.NormalizeCSharpAcronyms(); + private protected virtual bool IsCustomizedValueName(string name) => GetMemberSuppressionAttributes().Any(a => a.ConstructorArguments.Length > 0 && a.ConstructorArguments[0].Value is string suppressedName && suppressedName == name); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs index b60ded0dfc7..cd8b7639218 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs @@ -7,6 +7,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; +using System.Text.RegularExpressions; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -19,7 +20,7 @@ namespace Microsoft.TypeSpec.Generator.Providers { - public class ExtensibleEnumProvider : EnumProvider + public partial class ExtensibleEnumProvider : EnumProvider { private readonly IReadOnlyList _allowedValues; private readonly TypeSignatureModifiers _modifiers; @@ -43,6 +44,19 @@ internal ExtensibleEnumProvider(InputEnumType input, TypeProvider? declaringType private readonly FieldProvider _valueField; + private protected override string NormalizeValueName(string inputName, string generatedName) + { + // Use the input name to find words before ToIdentifierName removes separators. + var name = UppercaseWords().Replace(inputName, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()); + return base.NormalizeValueName(inputName, name == inputName ? generatedName : name.ToIdentifierName().NormalizeCSharpUrlSuffix()); + } + + [GeneratedRegex(""" + (? typeof(string)); @@ -1330,7 +1333,7 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() enumValues, isExtensible: true); enumValues.Add(InputFactory.EnumMember.String("One", "1", enumType)); - enumValues.Add(InputFactory.EnumMember.String("snake_case_value", "2", enumType, isExactName: true)); + enumValues.Add(InputFactory.EnumMember.String(name, name, enumType, isExactName: isExactName)); var enumProvider = EnumProvider.Create(enumType); var fields = enumProvider.Fields; @@ -1340,12 +1343,12 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() Assert.AreEqual(3, fields.Count); Assert.AreEqual("_value", fields[0].Name); Assert.AreEqual("OneValue", fields[1].Name); - // exact-name value: name preserved verbatim, with the `Value` suffix appended - Assert.AreEqual("snake_case_valueValue", fields[2].Name); + Assert.AreEqual(expectedName + "Value", fields[2].Name); + Assert.AreEqual(name, ((LiteralExpression)fields[2].InitializationValue!).Literal); Assert.AreEqual(2, properties.Count); Assert.AreEqual("One", properties[0].Name); - Assert.AreEqual("snake_case_value", properties[1].Name); + Assert.AreEqual(expectedName, properties[1].Name); } [TestCase(false, "CallbackUrl", false, "CallbackUri")] From 31e5020c2ef8b22f02fcb768cd0bb1fe2fbe9322 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 16:43:45 +0000 Subject: [PATCH 03/11] refactor(csharp): scope enum member casing to extensible views Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Extensions/StringExtensions.cs | 9 ++++ .../src/Providers/EnumProvider.cs | 10 +++-- .../src/Providers/ExtensibleEnumProvider.cs | 16 +------ .../EnumProviders/EnumProviderTests.cs | 43 +++++++++++++------ 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index aa4ad0142dd..ea8304f4591 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -4,12 +4,21 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Text; +using System.Text.RegularExpressions; using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.TypeSpec.Generator.Input.Extensions { public static class StringExtensions { + private static readonly Regex _uppercaseWords = new(""" + (? + _uppercaseWords.Replace(name, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()); + private static bool IsWordSeparator(char c, bool preserveUnderscores = false) => !SyntaxFacts.IsIdentifierPartCharacter(c) || (!preserveUnderscores && c == '_'); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index 64c1453d3e7..76d880d9ab2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -150,6 +150,8 @@ private protected string[] GetGeneratedValueNames( { var previousNames = inputValues.Select(v => GetGeneratedValueName(v, lastContractNames)).ToArray(); var normalizedNames = new string[previousNames.Length]; + // An extensible input can also have a fixed view used by custom code. + bool normalizeUppercase = IsExtensible && this is ExtensibleEnumProvider; for (int i = 0; i < previousNames.Length; i++) { var name = previousNames[i]; @@ -159,7 +161,10 @@ private protected string[] GetGeneratedValueNames( continue; } - var normalizedName = NormalizeValueName(inputValues[i].Name, name); + var inputName = inputValues[i].Name; + var pascalName = normalizeUppercase ? inputName.NormalizeUppercaseWords() : inputName; + var normalizedName = (pascalName == inputName ? name : pascalName.ToIdentifierName().NormalizeCSharpUrlSuffix()) + .NormalizeCSharpAcronyms(); normalizedNames[i] = lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName) ? name : normalizedName; @@ -167,9 +172,6 @@ private protected string[] GetGeneratedValueNames( return normalizedNames; } - private protected virtual string NormalizeValueName(string inputName, string generatedName) => - generatedName.NormalizeCSharpAcronyms(); - private protected virtual bool IsCustomizedValueName(string name) => GetMemberSuppressionAttributes().Any(a => a.ConstructorArguments.Length > 0 && a.ConstructorArguments[0].Value is string suppressedName && suppressedName == name); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs index cd8b7639218..b60ded0dfc7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs @@ -7,7 +7,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; -using System.Text.RegularExpressions; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -20,7 +19,7 @@ namespace Microsoft.TypeSpec.Generator.Providers { - public partial class ExtensibleEnumProvider : EnumProvider + public class ExtensibleEnumProvider : EnumProvider { private readonly IReadOnlyList _allowedValues; private readonly TypeSignatureModifiers _modifiers; @@ -44,19 +43,6 @@ internal ExtensibleEnumProvider(InputEnumType input, TypeProvider? declaringType private readonly FieldProvider _valueField; - private protected override string NormalizeValueName(string inputName, string generatedName) - { - // Use the input name to find words before ToIdentifierName removes separators. - var name = UppercaseWords().Replace(inputName, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()); - return base.NormalizeValueName(inputName, name == inputName ? generatedName : name.ToIdentifierName().NormalizeCSharpUrlSuffix()); - } - - [GeneratedRegex(""" - (? typeof(string)); @@ -1333,7 +1330,7 @@ public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool is enumValues, isExtensible: true); enumValues.Add(InputFactory.EnumMember.String("One", "1", enumType)); - enumValues.Add(InputFactory.EnumMember.String(name, name, enumType, isExactName: isExactName)); + enumValues.Add(InputFactory.EnumMember.String("snake_case_value", "2", enumType, isExactName: true)); var enumProvider = EnumProvider.Create(enumType); var fields = enumProvider.Fields; @@ -1343,12 +1340,34 @@ public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool is Assert.AreEqual(3, fields.Count); Assert.AreEqual("_value", fields[0].Name); Assert.AreEqual("OneValue", fields[1].Name); - Assert.AreEqual(expectedName + "Value", fields[2].Name); - Assert.AreEqual(name, ((LiteralExpression)fields[2].InitializationValue!).Literal); + // exact-name value: name preserved verbatim, with the `Value` suffix appended + Assert.AreEqual("snake_case_valueValue", fields[2].Name); Assert.AreEqual(2, properties.Count); Assert.AreEqual("One", properties[0].Name); - Assert.AreEqual(expectedName, properties[1].Name); + Assert.AreEqual("snake_case_value", properties[1].Name); + } + + [TestCase("AND", false, "And")] + [TestCase("OR", false, "Or")] + [TestCase("NOT_FOUND", false, "NotFound")] + [TestCase("HTTPStatus", false, "HttpStatus")] + [TestCase("CallbackURL", false, "CallbackUri")] + [TestCase("AND", true, "AND")] + public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool isExactName, string expectedName) + { + MockHelpers.LoadMockGenerator(createCSharpTypeCore: _ => typeof(string)); + + var values = new List(); + var input = InputFactory.Enum("MockInputEnum", InputPrimitiveType.String, values, isExtensible: true); + values.Add(InputFactory.EnumMember.String(name, name, input, isExactName: isExactName)); + + var provider = EnumProvider.Create(input); + var member = provider.EnumValues.Single(); + + Assert.AreEqual(expectedName, provider.Properties.Single().Name); + Assert.AreEqual(expectedName + "Value", member.Field.Name); + Assert.AreEqual(name, ((LiteralExpression)member.Field.InitializationValue!).Literal); } [TestCase(false, "CallbackUrl", false, "CallbackUri")] From d72868929948bc79cf8cea22ef5d86c36dd7742a Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 16:54:32 +0000 Subject: [PATCH 04/11] refactor(csharp): pass the extensible enum casing guard inline Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/EnumProvider.cs | 5 ++--- .../src/Providers/ExtensibleEnumProvider.cs | 2 +- .../test/Providers/EnumProviders/EnumProviderTests.cs | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index 76d880d9ab2..cf732e338e6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -146,12 +146,11 @@ private protected string GetBackCompatibleName( private protected string[] GetGeneratedValueNames( IReadOnlyList inputValues, - IReadOnlyList lastContractNames) + IReadOnlyList lastContractNames, + bool normalizeUppercase = false) { var previousNames = inputValues.Select(v => GetGeneratedValueName(v, lastContractNames)).ToArray(); var normalizedNames = new string[previousNames.Length]; - // An extensible input can also have a fixed view used by custom code. - bool normalizeUppercase = IsExtensible && this is ExtensibleEnumProvider; for (int i = 0; i < previousNames.Length; i++) { var name = previousNames[i]; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs index b60ded0dfc7..e8551a6fbb2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs @@ -59,7 +59,7 @@ private protected override bool IsCustomizedValueName(string name) protected override IReadOnlyList BuildEnumValues() { var lastContractNames = LastContractView?.Properties.Select(p => p.Name).ToArray() ?? []; - var generatedNames = GetGeneratedValueNames(_allowedValues, lastContractNames); + var generatedNames = GetGeneratedValueNames(_allowedValues, lastContractNames, normalizeUppercase: IsExtensible); var values = new EnumTypeMember[_allowedValues.Count]; for (int i = 0; i < _allowedValues.Count; i++) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index d82e08afb56..462123f4026 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -1352,6 +1352,7 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() [TestCase("OR", false, "Or")] [TestCase("NOT_FOUND", false, "NotFound")] [TestCase("HTTPStatus", false, "HttpStatus")] + [TestCase("IOStream", false, "IOStream")] [TestCase("CallbackURL", false, "CallbackUri")] [TestCase("AND", true, "AND")] public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool isExactName, string expectedName) From 45ed1c009050af4a42179911243276551771abb7 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:05:07 +0000 Subject: [PATCH 05/11] fix(csharp): simplify extensible enum member naming Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Extensions/StringExtensions.cs | 5 ++-- .../src/Providers/EnumProvider.cs | 24 +++++++++++++------ .../src/Providers/ExtensibleEnumProvider.cs | 2 +- .../EnumProviders/EnumProviderTests.cs | 15 ++++++++---- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index ea8304f4591..cba458dc494 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -16,8 +16,9 @@ public static class StringExtensions | (? - _uppercaseWords.Replace(name, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()); + public static string ToPascalCaseIdentifierName(this string name) => + _uppercaseWords.Replace(name, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()) + .ToIdentifierName(); private static bool IsWordSeparator(char c, bool preserveUnderscores = false) => !SyntaxFacts.IsIdentifierPartCharacter(c) || (!preserveUnderscores && c == '_'); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index cf732e338e6..e2c0e460189 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -160,13 +160,23 @@ private protected string[] GetGeneratedValueNames( continue; } - var inputName = inputValues[i].Name; - var pascalName = normalizeUppercase ? inputName.NormalizeUppercaseWords() : inputName; - var normalizedName = (pascalName == inputName ? name : pascalName.ToIdentifierName().NormalizeCSharpUrlSuffix()) - .NormalizeCSharpAcronyms(); - normalizedNames[i] = lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName) - ? name - : normalizedName; + var identifier = normalizeUppercase ? inputValues[i].Name.ToPascalCaseIdentifierName() : name; + var urlName = normalizeUppercase ? identifier.NormalizeCSharpUrlSuffix() : name; + var normalizedName = urlName.NormalizeCSharpAcronyms(); + if (lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName)) + { + normalizedName = name; + } + else if (urlName != identifier && urlName != name && !IsCustomizedValueName(normalizedName)) + { + // A new suffix rewrite can hide a compatible name that differs only in casing or underscores. + var compatibleName = GetBackCompatibleName(name, previousNames, lastContractNames, isExactName: false); + if (compatibleName != name) + { + normalizedName = compatibleName; + } + } + normalizedNames[i] = normalizedName; } return normalizedNames; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs index e8551a6fbb2..1e7dd3da2a6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs @@ -59,7 +59,7 @@ private protected override bool IsCustomizedValueName(string name) protected override IReadOnlyList BuildEnumValues() { var lastContractNames = LastContractView?.Properties.Select(p => p.Name).ToArray() ?? []; - var generatedNames = GetGeneratedValueNames(_allowedValues, lastContractNames, normalizeUppercase: IsExtensible); + var generatedNames = GetGeneratedValueNames(_allowedValues, lastContractNames, normalizeUppercase: true); var values = new EnumTypeMember[_allowedValues.Count]; for (int i = 0; i < _allowedValues.Count; i++) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index 462123f4026..ce5116ecb91 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -1351,6 +1351,12 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() [TestCase("AND", false, "And")] [TestCase("OR", false, "Or")] [TestCase("NOT_FOUND", false, "NotFound")] + [TestCase("FooOR", false, "FooOR")] + [TestCase("ORfoo", false, "ORfoo")] + [TestCase("Foo_OR", false, "FooOr")] + [TestCase("OR_foo", false, "OrFoo")] + [TestCase("ORFoo", false, "ORFoo")] + [TestCase("FooHTTP", false, "FooHttp")] [TestCase("HTTPStatus", false, "HttpStatus")] [TestCase("IOStream", false, "IOStream")] [TestCase("CallbackURL", false, "CallbackUri")] @@ -1397,16 +1403,17 @@ public void BuildEnumType_ReplacesCompleteUrlSuffixOnValues( Assert.AreEqual(expectedName, enumProvider.EnumValues.Single().Name); } - [TestCase(false, "Fixed")] - [TestCase(true, "Extensible")] - public async Task BuildEnumType_PreservesUrlSuffixFromLastContract(bool isExtensible, string testData) + [TestCase(false, "Fixed", "CallbackUrl")] + [TestCase(true, "Extensible", "CallbackUrl")] + [TestCase(true, "Extensible", "CallbackURL")] + public async Task BuildEnumType_PreservesUrlSuffixFromLastContract(bool isExtensible, string testData, string inputName) { await MockHelpers.LoadMockGeneratorAsync( createCSharpTypeCore: (inputType) => typeof(string), lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync(parameters: testData)); var input = InputFactory.StringEnum( "mockInputEnum", - [("CallbackUrl", "value")], + [(inputName, "value")], isExtensible: isExtensible); var enumProvider = EnumProvider.Create(input); From e072b7b7e3f40b138ab1967ef3e22862a4a25dd7 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:08:24 +0000 Subject: [PATCH 06/11] test(csharp): cover underscored URL enum compatibility Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../EnumProviders/EnumProviderTests.cs | 17 +++++++++++++++++ .../MockInputEnum.cs | 7 +++++++ 2 files changed, 24 insertions(+) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName/MockInputEnum.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index ce5116ecb91..47392c8dc6f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -1184,6 +1184,23 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("Other", enumType.Properties[1].Name); } + [Test] + public async Task BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName() + { + await MockHelpers.LoadMockGeneratorAsync( + createCSharpTypeCore: _ => typeof(string), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + var input = InputFactory.StringEnum("mockInputEnum", [("CallbackURL", "callback-url")], isExtensible: true); + + var enumType = EnumProvider.Create(input); + enumType.EnsureBuilt(); + enumType.ProcessTypeForBackCompatibility(); + + Assert.AreEqual("Callback_Url", enumType.Properties.Single().Name); + var field = enumType.Fields.Single(f => f.Name == "Callback_UrlValue"); + Assert.AreEqual("callback-url", ((LiteralExpression)field.InitializationValue!).Literal); + } + // Verifies that when custom code already implements the underscore-named member (e.g. the // user manually re-added 'Existing_Value' pointing at the generated 'ExistingValue'), the // underscore back-compat restoration does NOT rename the generated member. Otherwise the diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName/MockInputEnum.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName/MockInputEnum.cs new file mode 100644 index 00000000000..2a6ba6c0cc6 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName/MockInputEnum.cs @@ -0,0 +1,7 @@ +namespace Sample.Models +{ + public readonly partial struct MockInputEnum + { + public static MockInputEnum Callback_Url { get; } + } +} From ba2b2b1b489d73f61c7fdbd4fbdc9d846766a768 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:12:44 +0000 Subject: [PATCH 07/11] fix(csharp): normalize numeric-suffixed extensible enum names Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Extensions/StringExtensions.cs | 3 ++- .../test/Providers/EnumProviders/EnumProviderTests.cs | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index cba458dc494..c54ca4f39c9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -12,7 +12,8 @@ namespace Microsoft.TypeSpec.Generator.Input.Extensions public static class StringExtensions { private static readonly Regex _uppercaseWords = new(""" - (? Date: Fri, 20 Nov 2026 17:35:55 +0000 Subject: [PATCH 08/11] refactor(csharp): guard extensible enum name normalization Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/EnumProvider.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index e2c0e460189..9d804acfc55 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -160,14 +160,21 @@ private protected string[] GetGeneratedValueNames( continue; } - var identifier = normalizeUppercase ? inputValues[i].Name.ToPascalCaseIdentifierName() : name; - var urlName = normalizeUppercase ? identifier.NormalizeCSharpUrlSuffix() : name; - var normalizedName = urlName.NormalizeCSharpAcronyms(); + var normalizedName = name; + var hasNewUrlRewrite = false; + if (normalizeUppercase) + { + var identifier = inputValues[i].Name.ToPascalCaseIdentifierName(); + normalizedName = identifier.NormalizeCSharpUrlSuffix(); + hasNewUrlRewrite = normalizedName != identifier && normalizedName != name; + } + + normalizedName = normalizedName.NormalizeCSharpAcronyms(); if (lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName)) { normalizedName = name; } - else if (urlName != identifier && urlName != name && !IsCustomizedValueName(normalizedName)) + else if (hasNewUrlRewrite && !IsCustomizedValueName(normalizedName)) { // A new suffix rewrite can hide a compatible name that differs only in casing or underscores. var compatibleName = GetBackCompatibleName(name, previousNames, lastContractNames, isExactName: false); From dce1b5e9250b6f15855f4ba58c77494ea4d02860 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:41:44 +0000 Subject: [PATCH 09/11] fix(csharp): only normalize whole uppercase enum words Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Extensions/StringExtensions.cs | 7 ++++--- .../Providers/EnumProviders/EnumProviderTests.cs | 15 +++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index c54ca4f39c9..6035ee056e0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -12,9 +12,10 @@ namespace Microsoft.TypeSpec.Generator.Input.Extensions public static class StringExtensions { private static readonly Regex _uppercaseWords = new(""" - (? diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index d62075f77b0..3152582018a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -1184,13 +1184,14 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("Other", enumType.Properties[1].Name); } - [Test] - public async Task BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName() + [TestCase("CallbackURL")] + [TestCase("CALLBACK_URL")] + public async Task BackCompat_ExtensibleEnumUrlSuffixPreservesUnderscoredName(string inputName) { await MockHelpers.LoadMockGeneratorAsync( createCSharpTypeCore: _ => typeof(string), lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); - var input = InputFactory.StringEnum("mockInputEnum", [("CallbackURL", "callback-url")], isExtensible: true); + var input = InputFactory.StringEnum("mockInputEnum", [(inputName, "callback-url")], isExtensible: true); var enumType = EnumProvider.Create(input); enumType.EnsureBuilt(); @@ -1373,15 +1374,17 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() [TestCase("Foo_OR", false, "FooOr")] [TestCase("OR_foo", false, "OrFoo")] [TestCase("ORFoo", false, "ORFoo")] - [TestCase("FooHTTP", false, "FooHttp")] - [TestCase("HTTPStatus", false, "HttpStatus")] + [TestCase("FooHTTP", false, "FooHTTP")] + [TestCase("HTTPStatus", false, "HTTPStatus")] [TestCase("HTTP2", false, "Http2")] [TestCase("HTTP_2", false, "Http2")] [TestCase("UTF8", false, "Utf8")] [TestCase("HTTP2foo", false, "HTTP2foo")] [TestCase("HTTP2", true, "HTTP2")] [TestCase("IOStream", false, "IOStream")] - [TestCase("CallbackURL", false, "CallbackUri")] + [TestCase("CallbackURL", false, "CallbackURL")] + [TestCase("CALLBACKURL", false, "Callbackurl")] + [TestCase("CALLBACK_URL", false, "CallbackUri")] [TestCase("AND", true, "AND")] public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool isExactName, string expectedName) { From 0601a2a8a2fd023e892ee8a34e2fb0cf87379294 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 20:18:47 +0000 Subject: [PATCH 10/11] test(csharp): validate enum casing with TestData baseline Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../EnumProviders/EnumProviderTests.cs | 67 ++++++++----- ...mType_ExtensibleStringEnum_MemberCasing.cs | 97 +++++++++++++++++++ 2 files changed, 138 insertions(+), 26 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs index 3152582018a..1055fcf28ee 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/EnumProviderTests.cs @@ -1366,40 +1366,55 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() Assert.AreEqual("snake_case_value", properties[1].Name); } - [TestCase("AND", false, "And")] - [TestCase("OR", false, "Or")] - [TestCase("NOT_FOUND", false, "NotFound")] - [TestCase("FooOR", false, "FooOR")] - [TestCase("ORfoo", false, "ORfoo")] - [TestCase("Foo_OR", false, "FooOr")] - [TestCase("OR_foo", false, "OrFoo")] - [TestCase("ORFoo", false, "ORFoo")] - [TestCase("FooHTTP", false, "FooHTTP")] - [TestCase("HTTPStatus", false, "HTTPStatus")] - [TestCase("HTTP2", false, "Http2")] - [TestCase("HTTP_2", false, "Http2")] - [TestCase("UTF8", false, "Utf8")] - [TestCase("HTTP2foo", false, "HTTP2foo")] - [TestCase("HTTP2", true, "HTTP2")] - [TestCase("IOStream", false, "IOStream")] - [TestCase("CallbackURL", false, "CallbackURL")] - [TestCase("CALLBACKURL", false, "Callbackurl")] - [TestCase("CALLBACK_URL", false, "CallbackUri")] - [TestCase("AND", true, "AND")] - public void BuildEnumType_ExtensibleStringEnum_MemberCasing(string name, bool isExactName, string expectedName) + [Test] + public void BuildEnumType_ExtensibleStringEnum_MemberCasing() { MockHelpers.LoadMockGenerator(createCSharpTypeCore: _ => typeof(string)); + var members = new (string Name, bool IsExactName)[] + { + ("AND", false), + ("OR", false), + ("NOT_FOUND", false), + ("FooOR", false), + ("ORfoo", false), + ("Foo_OR", false), + ("OR_foo", false), + ("ORFoo", false), + ("FooHTTP", false), + ("HTTPStatus", false), + ("HTTP2", false), + ("UTF8", false), + ("HTTP2foo", false), + ("HTTP2", true), + ("IOStream", false), + ("CallbackURL", false), + ("CALLBACKURL", false), + ("CALLBACK_URL", false), + ("AND", true), + }; var values = new List(); var input = InputFactory.Enum("MockInputEnum", InputPrimitiveType.String, values, isExtensible: true); - values.Add(InputFactory.EnumMember.String(name, name, input, isExactName: isExactName)); + foreach (var member in members) + { + values.Add(InputFactory.EnumMember.String(member.Name, member.Name, input, isExactName: member.IsExactName)); + } + + var provider = EnumProvider.Create(input); + var content = new TypeProviderWriter(provider).Write().Content; + Assert.AreEqual(Helpers.GetExpectedFromFile(), content); + } + + [Test] + public void BuildEnumType_ExtensibleStringEnum_UnderscoredNumericSuffixCasing() + { + MockHelpers.LoadMockGenerator(createCSharpTypeCore: _ => typeof(string)); + var input = InputFactory.StringEnum("MockInputEnum", [("HTTP_2", "HTTP_2")], isExtensible: true); var provider = EnumProvider.Create(input); - var member = provider.EnumValues.Single(); - Assert.AreEqual(expectedName, provider.Properties.Single().Name); - Assert.AreEqual(expectedName + "Value", member.Field.Name); - Assert.AreEqual(name, ((LiteralExpression)member.Field.InitializationValue!).Literal); + Assert.AreEqual("Http2", provider.Properties.Single().Name); + Assert.AreEqual("HTTP_2", ((LiteralExpression)provider.EnumValues.Single().Field.InitializationValue!).Literal); } [TestCase(false, "CallbackUrl", false, "CallbackUri")] diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs new file mode 100644 index 00000000000..887e3badd7f --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs @@ -0,0 +1,97 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; +using Sample; + +namespace Sample.Models +{ + public readonly partial struct MockInputEnum : global::System.IEquatable + { + private readonly string _value; + private const string AndValue = "AND"; + private const string OrValue = "OR"; + private const string NotFoundValue = "NOT_FOUND"; + private const string FooORValue = "FooOR"; + private const string ORfooValue = "ORfoo"; + private const string FooOrValue = "Foo_OR"; + private const string OrFooValue = "OR_foo"; + private const string ORFooValue = "ORFoo"; + private const string FooHTTPValue = "FooHTTP"; + private const string HTTPStatusValue = "HTTPStatus"; + private const string Http2Value = "HTTP2"; + private const string Utf8Value = "UTF8"; + private const string HTTP2fooValue = "HTTP2foo"; + private const string HTTP2Value = "HTTP2"; + private const string IOStreamValue = "IOStream"; + private const string CallbackURLValue = "CallbackURL"; + private const string CallbackurlValue = "CALLBACKURL"; + private const string CallbackUriValue = "CALLBACK_URL"; + private const string ANDValue = "AND"; + + public MockInputEnum(string value) + { + global::Sample.Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + public static global::Sample.Models.MockInputEnum And { get; } = new global::Sample.Models.MockInputEnum(AndValue); + + public static global::Sample.Models.MockInputEnum Or { get; } = new global::Sample.Models.MockInputEnum(OrValue); + + public static global::Sample.Models.MockInputEnum NotFound { get; } = new global::Sample.Models.MockInputEnum(NotFoundValue); + + public static global::Sample.Models.MockInputEnum FooOR { get; } = new global::Sample.Models.MockInputEnum(FooORValue); + + public static global::Sample.Models.MockInputEnum ORfoo { get; } = new global::Sample.Models.MockInputEnum(ORfooValue); + + public static global::Sample.Models.MockInputEnum FooOr { get; } = new global::Sample.Models.MockInputEnum(FooOrValue); + + public static global::Sample.Models.MockInputEnum OrFoo { get; } = new global::Sample.Models.MockInputEnum(OrFooValue); + + public static global::Sample.Models.MockInputEnum ORFoo { get; } = new global::Sample.Models.MockInputEnum(ORFooValue); + + public static global::Sample.Models.MockInputEnum FooHTTP { get; } = new global::Sample.Models.MockInputEnum(FooHTTPValue); + + public static global::Sample.Models.MockInputEnum HTTPStatus { get; } = new global::Sample.Models.MockInputEnum(HTTPStatusValue); + + public static global::Sample.Models.MockInputEnum Http2 { get; } = new global::Sample.Models.MockInputEnum(Http2Value); + + public static global::Sample.Models.MockInputEnum Utf8 { get; } = new global::Sample.Models.MockInputEnum(Utf8Value); + + public static global::Sample.Models.MockInputEnum HTTP2foo { get; } = new global::Sample.Models.MockInputEnum(HTTP2fooValue); + + public static global::Sample.Models.MockInputEnum HTTP2 { get; } = new global::Sample.Models.MockInputEnum(HTTP2Value); + + public static global::Sample.Models.MockInputEnum IOStream { get; } = new global::Sample.Models.MockInputEnum(IOStreamValue); + + public static global::Sample.Models.MockInputEnum CallbackURL { get; } = new global::Sample.Models.MockInputEnum(CallbackURLValue); + + public static global::Sample.Models.MockInputEnum Callbackurl { get; } = new global::Sample.Models.MockInputEnum(CallbackurlValue); + + public static global::Sample.Models.MockInputEnum CallbackUri { get; } = new global::Sample.Models.MockInputEnum(CallbackUriValue); + + public static global::Sample.Models.MockInputEnum AND { get; } = new global::Sample.Models.MockInputEnum(ANDValue); + + public static bool operator ==(global::Sample.Models.MockInputEnum left, global::Sample.Models.MockInputEnum right) => left.Equals(right); + + public static bool operator !=(global::Sample.Models.MockInputEnum left, global::Sample.Models.MockInputEnum right) => !left.Equals(right); + + public static implicit operator global::Sample.Models.MockInputEnum(string value) => new global::Sample.Models.MockInputEnum(value); + + public static implicit operator global::Sample.Models.MockInputEnum?(string value) => (value == null) ? ((global::Sample.Models.MockInputEnum?)null) : new global::Sample.Models.MockInputEnum(value); + + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Never)] + public override bool Equals(object obj) => ((obj is global::Sample.Models.MockInputEnum other) && this.Equals(other)); + + public bool Equals(global::Sample.Models.MockInputEnum other) => string.Equals(_value, other._value, global::System.StringComparison.InvariantCultureIgnoreCase); + + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Never)] + public override int GetHashCode() => (_value != null) ? global::System.StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + } +} From f1d7fb222678b08a0bdd4bd442e0d011c2fa5b59 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Fri, 20 Nov 2026 20:24:17 +0000 Subject: [PATCH 11/11] fix(csharp): normalize numeric suffixes on two-letter enum names Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Extensions/StringExtensions.cs | 2 +- .../Providers/EnumProviders/EnumProviderTests.cs | 12 ++++++++++++ ...uildEnumType_ExtensibleStringEnum_MemberCasing.cs | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs index 6035ee056e0..a767fbb3a61 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/Extensions/StringExtensions.cs @@ -14,7 +14,7 @@ public static class StringExtensions private static readonly Regex _uppercaseWords = new(""" (? p.Name).ToArray()); var content = new TypeProviderWriter(provider).Write().Content; Assert.AreEqual(Helpers.GetExpectedFromFile(), content); } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs index 887e3badd7f..5a11fb6620d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/EnumProviders/TestData/EnumProviderTests/BuildEnumType_ExtensibleStringEnum_MemberCasing.cs @@ -23,6 +23,10 @@ namespace Sample.Models private const string HTTPStatusValue = "HTTPStatus"; private const string Http2Value = "HTTP2"; private const string Utf8Value = "UTF8"; + private const string Vm2Value = "VM2"; + private const string Io2Value = "IO2"; + private const string IPV4Value = "IPV4"; + private const string IPV6Value = "IPV6"; private const string HTTP2fooValue = "HTTP2foo"; private const string HTTP2Value = "HTTP2"; private const string IOStreamValue = "IOStream"; @@ -62,6 +66,14 @@ public MockInputEnum(string value) public static global::Sample.Models.MockInputEnum Utf8 { get; } = new global::Sample.Models.MockInputEnum(Utf8Value); + public static global::Sample.Models.MockInputEnum Vm2 { get; } = new global::Sample.Models.MockInputEnum(Vm2Value); + + public static global::Sample.Models.MockInputEnum Io2 { get; } = new global::Sample.Models.MockInputEnum(Io2Value); + + public static global::Sample.Models.MockInputEnum IPV4 { get; } = new global::Sample.Models.MockInputEnum(IPV4Value); + + public static global::Sample.Models.MockInputEnum IPV6 { get; } = new global::Sample.Models.MockInputEnum(IPV6Value); + public static global::Sample.Models.MockInputEnum HTTP2foo { get; } = new global::Sample.Models.MockInputEnum(HTTP2fooValue); public static global::Sample.Models.MockInputEnum HTTP2 { get; } = new global::Sample.Models.MockInputEnum(HTTP2Value);