diff --git a/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts b/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts index 203a5995a2a..94f1bfd767d 100644 --- a/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts +++ b/packages/http-client-csharp/emitter/src/lib/client-model-builder.ts @@ -51,8 +51,6 @@ export function createModel(sdkContext: CSharpEmitterContext): CodeModel { fixNamingConflicts(models, constants); const clientModel: CodeModel = { - // To ensure deterministic library name, customers would need to set the package-name property as the ordering of the namespaces could change - // if the typespec is changed. name: getClientNamespaceString(sdkContext)!, apiVersions: rootApiVersions, enums: enums, diff --git a/packages/http-client-csharp/emitter/src/lib/utils.ts b/packages/http-client-csharp/emitter/src/lib/utils.ts index 93001017bea..aa8af4d3889 100644 --- a/packages/http-client-csharp/emitter/src/lib/utils.ts +++ b/packages/http-client-csharp/emitter/src/lib/utils.ts @@ -144,22 +144,31 @@ export function getClientNamespaceString(context: CSharpEmitterContext): string const packageName = context.emitContext.options["package-name"]; const serviceNamespaces = listAllServiceNamespaces(context); const firstNamespace = serviceNamespaces.length > 0 ? serviceNamespaces[0] : undefined; + // namespace is not a public emitter option, but it is supported by TCGC + const namespaceOverride = (context.emitContext.options as any).namespace; if (packageName) { - return getClientNamespaceStringHelper(packageName, firstNamespace); + return getClientNamespaceStringHelper(namespaceOverride, packageName, firstNamespace); } if (containsMultiServiceClient(context.sdkPackage.clients)) { - return getClientNamespaceStringHelper(context.sdkPackage.clients[0].namespace); + return getClientNamespaceStringHelper( + namespaceOverride, + context.sdkPackage.clients[0].namespace, + ); } - return getClientNamespaceStringHelper(undefined, firstNamespace); + return getClientNamespaceStringHelper(namespaceOverride, undefined, firstNamespace); } export function getClientNamespaceStringHelper( + namespaceOverride?: string, packageName?: string, namespace?: Namespace, ): string | undefined { + if (namespaceOverride) { + return namespaceOverride; + } if (packageName) { packageName = packageName .replace(/-/g, ".") diff --git a/packages/http-client-csharp/emitter/test/Unit/utils.test.ts b/packages/http-client-csharp/emitter/test/Unit/utils.test.ts index fae2a7d9549..c5a7b94d6fa 100644 --- a/packages/http-client-csharp/emitter/test/Unit/utils.test.ts +++ b/packages/http-client-csharp/emitter/test/Unit/utils.test.ts @@ -1,7 +1,8 @@ +import { listAllServiceNamespaces } from "@azure-tools/typespec-client-generator-core"; import * as childProcess from "child_process"; import { EventEmitter } from "events"; import { beforeEach, describe, expect, it, vi } from "vitest"; -import { execCSharpGenerator } from "../../src/lib/utils.js"; +import { execCSharpGenerator, getClientNamespaceStringHelper } from "../../src/lib/utils.js"; import { CSharpEmitterContext } from "../../src/sdk-context.js"; import { createCSharpSdkContext, @@ -84,3 +85,42 @@ describe("execCSharpGenerator tests", () => { expect(result.exitCode).toBe(0); }); }); + +describe("getClientNamespaceStringHelper", () => { + it("should return the formatted package name when namespace is undefined", () => { + expect(getClientNamespaceStringHelper(undefined, "client-plane-generated")).toBe( + "Client.Plane.Generated", + ); + expect(getClientNamespaceStringHelper(undefined, "client-plane-Generated")).toBe( + "Client.Plane.Generated", + ); + expect(getClientNamespaceStringHelper(undefined, "client-Plane-generated")).toBe( + "Client.Plane.Generated", + ); + }); + + it("should handle dots in package name", () => { + expect(getClientNamespaceStringHelper(undefined, "client.plane.generated")).toBe( + "Client.Plane.Generated", + ); + }); + + it("should return namespace override when provided", async () => { + expect(getClientNamespaceStringHelper("Namespace.Override", "Package.Name")).toBe( + "Namespace.Override", + ); + }); + + it("should fallback to Namespace from spec when namespace and package are not provided", async () => { + const runner = await createEmitterTestHost(); + const program = await typeSpecCompile(``, runner, { IsVersionNeeded: false }); + + const context = createEmitterContext(program); + const sdkContext = await createCSharpSdkContext(context); + const primaryNamespace = listAllServiceNamespaces(sdkContext)[0]; + + expect(getClientNamespaceStringHelper(undefined, undefined, primaryNamespace)).toBe( + "Azure.Csharp.Testing", + ); + }); +}); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs index 52964fc9a13..a7080cbf090 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs @@ -21,7 +21,7 @@ public class ModelReaderWriterContextDefinition : TypeProvider private static readonly CSharpTypeNameComparer s_cSharpTypeNameComparer = new CSharpTypeNameComparer(); private static readonly TypeProviderTypeNameComparer s_typeProviderNameComparer = new TypeProviderTypeNameComparer(); - internal static readonly string s_name = $"{ScmCodeModelGenerator.Instance.TypeFactory.ServiceName}Context"; + internal static readonly string s_name = $"{RemovePeriods(ScmCodeModelGenerator.Instance.TypeFactory.PrimaryNamespace)}Context"; protected override string BuildName() => s_name; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index b3e048b86a9..bd6a4d8c6dc 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -435,7 +435,7 @@ public EnumCacheKey(InputEnumType enumType, TypeProvider? declaringType) } private string? _primaryNamespace; - internal string PrimaryNamespace => _primaryNamespace ??= GetCleanNameSpace(CodeModelGenerator.Instance.InputLibrary.InputNamespace.Name); + public string PrimaryNamespace => _primaryNamespace ??= GetCleanNameSpace(CodeModelGenerator.Instance.InputLibrary.InputNamespace.Name); public string ServiceName => _serviceName ??= BuildServiceName(); private string? _serviceName; diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/EncodeArrayContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs similarity index 84% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/EncodeArrayContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs index ba94dca212b..f3ab669d97b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/EncodeArrayContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/Models/Encode_ArrayContext.cs @@ -10,7 +10,7 @@ namespace Encode._Array [ModelReaderWriterBuildable(typeof(NewlineDelimitedArrayProperty))] [ModelReaderWriterBuildable(typeof(PipeDelimitedArrayProperty))] [ModelReaderWriterBuildable(typeof(SpaceDelimitedArrayProperty))] - public partial class EncodeArrayContext : ModelReaderWriterContext + public partial class Encode_ArrayContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/TypeArrayContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/_Type_ArrayContext.cs similarity index 70% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/TypeArrayContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/_Type_ArrayContext.cs index 27848a76cea..a06d0a8ec92 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/TypeArrayContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/Models/_Type_ArrayContext.cs @@ -7,7 +7,7 @@ namespace _Type._Array { [ModelReaderWriterBuildable(typeof(InnerModel))] - public partial class TypeArrayContext : ModelReaderWriterContext + public partial class _Type_ArrayContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/TypeDictionaryContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/_TypeDictionaryContext.cs similarity index 70% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/TypeDictionaryContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/_TypeDictionaryContext.cs index b0cbc52a2cf..457fcc40c76 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/TypeDictionaryContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/Models/_TypeDictionaryContext.cs @@ -7,7 +7,7 @@ namespace _Type.Dictionary { [ModelReaderWriterBuildable(typeof(InnerModel))] - public partial class TypeDictionaryContext : ModelReaderWriterContext + public partial class _TypeDictionaryContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/TypeEnumExtensibleContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/_Type_EnumExtensibleContext.cs similarity index 61% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/TypeEnumExtensibleContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/_Type_EnumExtensibleContext.cs index c60105a53bc..ce3a01322e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/TypeEnumExtensibleContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/Models/_Type_EnumExtensibleContext.cs @@ -6,7 +6,7 @@ namespace _Type._Enum.Extensible { - public partial class TypeEnumExtensibleContext : ModelReaderWriterContext + public partial class _Type_EnumExtensibleContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/TypeEnumFixedContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/_Type_EnumFixedContext.cs similarity index 62% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/TypeEnumFixedContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/_Type_EnumFixedContext.cs index 314182f5c45..6adf89b656a 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/TypeEnumFixedContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/_Type_EnumFixedContext.cs @@ -6,7 +6,7 @@ namespace _Type._Enum.Fixed { - public partial class TypeEnumFixedContext : ModelReaderWriterContext + public partial class _Type_EnumFixedContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/TypeModelEmptyContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/_TypeModelEmptyContext.cs similarity index 79% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/TypeModelEmptyContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/_TypeModelEmptyContext.cs index af2bb3586aa..b72f861d1d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/TypeModelEmptyContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/_TypeModelEmptyContext.cs @@ -9,7 +9,7 @@ namespace _Type.Model.Empty [ModelReaderWriterBuildable(typeof(EmptyInput))] [ModelReaderWriterBuildable(typeof(EmptyInputOutput))] [ModelReaderWriterBuildable(typeof(EmptyOutput))] - public partial class TypeModelEmptyContext : ModelReaderWriterContext + public partial class _TypeModelEmptyContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/TypeModelInheritanceEnumDiscriminatorContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/_TypeModelInheritanceEnumDiscriminatorContext.cs similarity index 81% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/TypeModelInheritanceEnumDiscriminatorContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/_TypeModelInheritanceEnumDiscriminatorContext.cs index 9d70445f3a6..b495b0c63ff 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/TypeModelInheritanceEnumDiscriminatorContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/Models/_TypeModelInheritanceEnumDiscriminatorContext.cs @@ -12,7 +12,7 @@ namespace _Type.Model.Inheritance.EnumDiscriminator [ModelReaderWriterBuildable(typeof(Snake))] [ModelReaderWriterBuildable(typeof(UnknownDog))] [ModelReaderWriterBuildable(typeof(UnknownSnake))] - public partial class TypeModelInheritanceEnumDiscriminatorContext : ModelReaderWriterContext + public partial class _TypeModelInheritanceEnumDiscriminatorContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/TypeModelInheritanceNestedDiscriminatorContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/_TypeModelInheritanceNestedDiscriminatorContext.cs similarity index 83% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/TypeModelInheritanceNestedDiscriminatorContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/_TypeModelInheritanceNestedDiscriminatorContext.cs index 2951a9d76f5..f81c0d9cc5c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/TypeModelInheritanceNestedDiscriminatorContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/_TypeModelInheritanceNestedDiscriminatorContext.cs @@ -13,7 +13,7 @@ namespace _Type.Model.Inheritance.NestedDiscriminator [ModelReaderWriterBuildable(typeof(Shark))] [ModelReaderWriterBuildable(typeof(UnknownFish))] [ModelReaderWriterBuildable(typeof(UnknownShark))] - public partial class TypeModelInheritanceNestedDiscriminatorContext : ModelReaderWriterContext + public partial class _TypeModelInheritanceNestedDiscriminatorContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/TypeModelInheritanceNotDiscriminatedContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/_TypeModelInheritanceNotDiscriminatedContext.cs similarity index 74% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/TypeModelInheritanceNotDiscriminatedContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/_TypeModelInheritanceNotDiscriminatedContext.cs index 7b4543f451b..d252b0dff1b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/TypeModelInheritanceNotDiscriminatedContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/_TypeModelInheritanceNotDiscriminatedContext.cs @@ -9,7 +9,7 @@ namespace _Type.Model.Inheritance.NotDiscriminated [ModelReaderWriterBuildable(typeof(Cat))] [ModelReaderWriterBuildable(typeof(Pet))] [ModelReaderWriterBuildable(typeof(Siamese))] - public partial class TypeModelInheritanceNotDiscriminatedContext : ModelReaderWriterContext + public partial class _TypeModelInheritanceNotDiscriminatedContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/TypeModelInheritanceRecursiveContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/_TypeModelInheritanceRecursiveContext.cs similarity index 72% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/TypeModelInheritanceRecursiveContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/_TypeModelInheritanceRecursiveContext.cs index a06f7cd8f4e..730aaf940c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/TypeModelInheritanceRecursiveContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/_TypeModelInheritanceRecursiveContext.cs @@ -8,7 +8,7 @@ namespace _Type.Model.Inheritance.Recursive { [ModelReaderWriterBuildable(typeof(Element))] [ModelReaderWriterBuildable(typeof(Extension))] - public partial class TypeModelInheritanceRecursiveContext : ModelReaderWriterContext + public partial class _TypeModelInheritanceRecursiveContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TypeModelInheritanceSingleDiscriminatorContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/_TypeModelInheritanceSingleDiscriminatorContext.cs similarity index 85% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TypeModelInheritanceSingleDiscriminatorContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/_TypeModelInheritanceSingleDiscriminatorContext.cs index b0755c8987f..66003f92303 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TypeModelInheritanceSingleDiscriminatorContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/_TypeModelInheritanceSingleDiscriminatorContext.cs @@ -15,7 +15,7 @@ namespace _Type.Model.Inheritance.SingleDiscriminator [ModelReaderWriterBuildable(typeof(TRex))] [ModelReaderWriterBuildable(typeof(UnknownBird))] [ModelReaderWriterBuildable(typeof(UnknownDinosaur))] - public partial class TypeModelInheritanceSingleDiscriminatorContext : ModelReaderWriterContext + public partial class _TypeModelInheritanceSingleDiscriminatorContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/TypeModelUsageContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/_TypeModelUsageContext.cs similarity index 79% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/TypeModelUsageContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/_TypeModelUsageContext.cs index 1f18d53d3ed..ce0a2f8e119 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/TypeModelUsageContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/_TypeModelUsageContext.cs @@ -9,7 +9,7 @@ namespace _Type.Model.Usage [ModelReaderWriterBuildable(typeof(InputOutputRecord))] [ModelReaderWriterBuildable(typeof(InputRecord))] [ModelReaderWriterBuildable(typeof(OutputRecord))] - public partial class TypeModelUsageContext : ModelReaderWriterContext + public partial class _TypeModelUsageContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/TypeModelVisibilityContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/_TypeModelVisibilityContext.cs similarity index 75% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/TypeModelVisibilityContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/_TypeModelVisibilityContext.cs index ac9f65da2ac..c4d28a30bed 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/TypeModelVisibilityContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/_TypeModelVisibilityContext.cs @@ -8,7 +8,7 @@ namespace _Type.Model.Visibility { [ModelReaderWriterBuildable(typeof(ReadOnlyModel))] [ModelReaderWriterBuildable(typeof(VisibilityModel))] - public partial class TypeModelVisibilityContext : ModelReaderWriterContext + public partial class _TypeModelVisibilityContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/TypePropertyAdditionalPropertiesContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/_TypePropertyAdditionalPropertiesContext.cs similarity index 96% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/TypePropertyAdditionalPropertiesContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/_TypePropertyAdditionalPropertiesContext.cs index 77cfa26babd..ad3172fc71e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/TypePropertyAdditionalPropertiesContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/Models/_TypePropertyAdditionalPropertiesContext.cs @@ -45,7 +45,7 @@ namespace _Type.Property.AdditionalProperties [ModelReaderWriterBuildable(typeof(WidgetData0))] [ModelReaderWriterBuildable(typeof(WidgetData1))] [ModelReaderWriterBuildable(typeof(WidgetData2))] - public partial class TypePropertyAdditionalPropertiesContext : ModelReaderWriterContext + public partial class _TypePropertyAdditionalPropertiesContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/TypePropertyNullableContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/_TypePropertyNullableContext.cs similarity index 88% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/TypePropertyNullableContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/_TypePropertyNullableContext.cs index 7c082980c17..ace8879df09 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/TypePropertyNullableContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/_TypePropertyNullableContext.cs @@ -14,7 +14,7 @@ namespace _Type.Property.Nullable [ModelReaderWriterBuildable(typeof(DurationProperty))] [ModelReaderWriterBuildable(typeof(InnerModel))] [ModelReaderWriterBuildable(typeof(StringProperty))] - public partial class TypePropertyNullableContext : ModelReaderWriterContext + public partial class _TypePropertyNullableContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/TypePropertyOptionalContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/_TypePropertyOptionalContext.cs similarity index 93% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/TypePropertyOptionalContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/_TypePropertyOptionalContext.cs index 4e48e1d8386..54babecfa21 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/TypePropertyOptionalContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/Models/_TypePropertyOptionalContext.cs @@ -22,7 +22,7 @@ namespace _Type.Property.Optional [ModelReaderWriterBuildable(typeof(UnionFloatLiteralProperty))] [ModelReaderWriterBuildable(typeof(UnionIntLiteralProperty))] [ModelReaderWriterBuildable(typeof(UnionStringLiteralProperty))] - public partial class TypePropertyOptionalContext : ModelReaderWriterContext + public partial class _TypePropertyOptionalContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/TypePropertyValueTypesContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/_TypePropertyValueTypesContext.cs similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/TypePropertyValueTypesContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/_TypePropertyValueTypesContext.cs index ddbec9c1f1d..565ab4b9a5e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/TypePropertyValueTypesContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/Models/_TypePropertyValueTypesContext.cs @@ -36,7 +36,7 @@ namespace _Type.Property.ValueTypes [ModelReaderWriterBuildable(typeof(UnknownDictProperty))] [ModelReaderWriterBuildable(typeof(UnknownIntProperty))] [ModelReaderWriterBuildable(typeof(UnknownStringProperty))] - public partial class TypePropertyValueTypesContext : ModelReaderWriterContext + public partial class _TypePropertyValueTypesContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/TypeScalarContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/_TypeScalarContext.cs similarity index 62% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/TypeScalarContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/_TypeScalarContext.cs index 34e703fd60a..3fb2aaf1b05 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/TypeScalarContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/Models/_TypeScalarContext.cs @@ -6,7 +6,7 @@ namespace _Type.Scalar { - public partial class TypeScalarContext : ModelReaderWriterContext + public partial class _TypeScalarContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/TypeUnionDiscriminatedContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs similarity index 72% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/TypeUnionDiscriminatedContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs index 3e4c5df7631..78a47c274e1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/TypeUnionDiscriminatedContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/discriminated/src/Generated/Models/_TypeUnionDiscriminatedContext.cs @@ -8,7 +8,7 @@ namespace _Type.Union.Discriminated { [ModelReaderWriterBuildable(typeof(Cat))] [ModelReaderWriterBuildable(typeof(Dog))] - public partial class TypeUnionDiscriminatedContext : ModelReaderWriterContext + public partial class _TypeUnionDiscriminatedContext : ModelReaderWriterContext { } } diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/TypeUnionContext.cs b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/_TypeUnionContext.cs similarity index 93% rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/TypeUnionContext.cs rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/_TypeUnionContext.cs index b729a9e7e74..60e51e84695 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/TypeUnionContext.cs +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/Models/_TypeUnionContext.cs @@ -22,7 +22,7 @@ namespace _Type.Union [ModelReaderWriterBuildable(typeof(MixedLiteralsCases))] [ModelReaderWriterBuildable(typeof(MixedTypesCases))] [ModelReaderWriterBuildable(typeof(StringAndArrayCases))] - public partial class TypeUnionContext : ModelReaderWriterContext + public partial class _TypeUnionContext : ModelReaderWriterContext { } }