From 62102626505c020e5696246cb545bfd419c45a90 Mon Sep 17 00:00:00 2001 From: Dapeng Zhang Date: Fri, 7 Feb 2025 11:53:40 +0800 Subject: [PATCH] Implement tsp namespace for http-client-csharp (#5443) Fixes https://github.com/microsoft/typespec/issues/5442 Fixes https://github.com/microsoft/typespec/issues/5471 Fixes https://github.com/microsoft/typespec/issues/5563 Fixes https://github.com/Azure/azure-sdk-for-net/issues/47670 This PR contains the following: 1. now we honor the namespace defined in typespec for both model and clients (short for "namespace is namespace" feature) 2. removes the `namespace` configuration from the emitter because we no longer need it. Azure generator still needs this, we will add it back in azure emitter (temporary until azure generator decides how to deal with it) 3. removes the `use-model-namespace` configuration from the emitter because we no longer need it. Azure generator still needs this, we will add it back in azure emitter (temporary until azure generator decides how to deal with it) 4. reports diagnostic when there are conflicts between namespace segments and subclient names. Because this change changes the namespace of literally everything, there are quite a few file changed. Majority of them are the generated files changed for the namespace. We also have a piece of logic that automatically renames the client `Models` to `ModelsOps` in our emitter. We should not have it in the emitter any way. This part is removed. Azure part needs it, therefore we will add the same logic back in azure generator. Update: I have to add the configuration `namespace` back because `autorest.csharp` is still strongly coupled with this configuration, removing it causes massive changes on that side. Therefore I decided that we keep it here for now, we still write its value to configuration.json for backward compatibility, but MGC will not read it nor use it. --- .../http-client-csharp/emitter/src/emitter.ts | 4 +- .../emitter/src/lib/client-model-builder.ts | 44 ++-- .../http-client-csharp/emitter/src/lib/lib.ts | 12 +- .../emitter/src/lib/type-converter.ts | 6 + .../http-client-csharp/emitter/src/options.ts | 2 - .../emitter/src/type/configuration.ts | 1 - .../emitter/src/type/input-client.ts | 1 + .../emitter/src/type/input-type.ts | 4 + .../emitter/src/type/literal-type-context.ts | 1 + .../eng/scripts/Generate.ps1 | 3 +- .../eng/scripts/Generation.psm1 | 28 +-- .../src/Providers/ClientProvider.cs | 6 +- .../src/Providers/RestClientProvider.cs | 2 + .../Providers/ScmMethodProviderCollection.cs | 3 +- .../test/InputLibraryVisitorTests.cs | 4 +- .../Unbranded_TypeSpec/FriendTests.cs | 3 +- ...odelWithRequiredNullablePropertiesTests.cs | 2 +- .../Unbranded_TypeSpec/ProjectedModelTests.cs | 1 - .../ReturnsAnonymousModelResponseTests.cs | 2 +- .../Unbranded_TypeSpec/RoundTripModelTests.cs | 2 +- .../Unbranded_TypeSpec/ThingTests.cs | 2 +- .../Abstractions/ClientResponseApiTests.cs | 2 +- .../Abstractions/HttpMessageApiTests.cs | 2 +- .../ClientProviderCustomizationTests.cs | 4 +- .../ClientProviderSubClientTests.cs | 10 +- .../ClientProviders/ClientProviderTests.cs | 10 +- .../AdditionalPropertiesTest.cs | 6 +- .../JsonModelCoreTests.cs | 6 +- .../MrwSerializationTypeDefinitionTests.cs | 2 +- .../SerializationCustomizationTests.cs | 157 ++++++------- .../test/TestHelpers/MockHelpers.cs | 5 +- .../src/InputTypes/InputClient.cs | 6 +- .../src/InputTypes/InputEnumType.cs | 4 +- .../src/InputTypes/InputModelType.cs | 5 +- .../src/InputTypes/InputNamespace.cs | 13 +- .../TypeSpecInputClientConverter.cs | 24 ++ .../TypeSpecInputEnumTypeConverter.cs | 4 +- .../TypeSpecInputModelTypeConverter.cs | 4 + .../TypeSpecInputNamespaceConverter.cs | 6 +- .../Serialization/TypeSpecSerialization.cs | 1 + .../perf/CodeWriterBenchmark.cs | 2 +- .../src/Configuration.cs | 88 ------- .../src/Primitives/NewProjectScaffolding.cs | 12 +- .../src/Properties/launchSettings.json | 5 - .../src/Providers/EnumProvider.cs | 4 +- .../src/Providers/ExtensibleEnumProvider.cs | 2 +- .../src/Providers/FixedEnumProvider.cs | 2 +- .../src/Providers/ModelFactoryProvider.cs | 2 +- .../src/Providers/ModelProvider.cs | 4 +- .../src/Providers/TypeProvider.cs | 2 +- .../src/Snippets/Snippet.cs | 17 +- .../src/SourceInput/SourceInputModel.cs | 10 +- .../src/TypeFactory.cs | 60 +++++ .../test/ConfigurationTests.cs | 70 ++---- .../test/InputLibraryVisitorTests.cs | 14 +- .../Providers/CanonicalTypeProviderTests.cs | 2 +- .../ModelFactoryProviderTests.cs | 2 +- .../SampleNamespaceModelFactory.cs | 2 +- .../SampleNamespaceModelFactory.cs | 2 +- .../ModelProviders/ModelCustomizationTests.cs | 4 +- .../CanCustomizePropertyIntoReadOnlyMemory.cs | 3 +- .../test/TestHelpers/Configuration.json | 1 - .../test/TestHelpers/MockHelpers.cs | 2 +- .../test/TestHelpers/TestNamedSymbol.cs | 2 +- .../test/TestHelpers/TestTypeProvider.cs | 2 + .../test/common/InputFactory.cs | 13 +- .../Http/Client/Naming/NamingTests.cs | 216 +++++++++--------- .../ClientOperationGroupTests.cs | 6 +- .../Client/Structure/Default/DefaultTests.cs | 6 +- .../Structure/MultiClient/MultiClientTests.cs | 5 +- .../RenamedOperation/RenamedOperationTests.cs | 5 +- .../TwoOperationGroupTests.cs | 7 +- .../Http/Encode/Bytes/EncodeBytesTests.cs | 1 - .../Http/Encode/DateTime/DateTimeTests.cs | 1 - .../Encode/Duration/EncodeDurationTest.cs | 2 +- .../Http/Encode/Numeric/EncodeNumericTests.cs | 2 +- .../Parameters/Basic/BasicParametersTests.cs | 2 +- .../BodyOptionality/BodyOptionalityTests.cs | 1 - .../Http/Parameters/Spread/SpreadTests.cs | 15 +- .../JsonMergePatch/JsonMergePatchTests.cs | 1 - .../SrvDriven/V1/SrvDrivenV1Tests.cs | 6 +- .../SrvDriven/V2/SrvDrivenV2Tests.cs | 5 +- .../EncodedName/Json/EncodedNameJsonTests.cs | 2 +- .../SpecialWords/SpecialWordsTests.Models.cs | 74 +++--- .../Added/V1/VersioningAddedV1Tests.cs | 3 +- .../Added/V2/VersioningAddedV2Tests.cs | 9 +- .../V1/VersioningMadeOptionalV1Tests.cs | 6 +- .../V2/VersioningMadeOptionalV2Tests.cs | 6 +- .../Removed/V1/VersioningRemovedV1Tests.cs | 10 +- .../Removed/V2/VersioningRemovedV2Tests.cs | 4 +- .../VersioningRemovedV2PreviewTests.cs | 4 +- .../V2/VersioningRenamedFromV2Tests.cs | 18 +- .../VersioningReturnTypeChangedFromV2Tests.cs | 3 +- .../V2/VersioningTypeChangedFromV2Tests.cs | 6 +- .../Http/_Type/Dictionary/DictionaryTests.cs | 1 - .../Http/_Type/Model/Empty/EmptyTests.cs | 1 - .../EnumDiscriminatorTest.cs | 2 - .../NestedDiscriminatorTests.cs | 1 - .../NotDiscriminated/NotDiscriminatedTests.cs | 1 - .../Inheritance/Recursive/RecursiveTests.cs | 1 - .../SingleDiscriminator/EagleTests.cs | 2 +- .../SingleDiscriminatorTests.cs | 7 +- .../Http/_Type/Model/Usage/UsageTests.cs | 1 - .../_Type/Model/Visibility/VisibilityTests.cs | 1 - .../AdditionalPropertiesTests.cs | 5 +- .../DifferentSpreadStringDerivedTests.cs | 2 +- .../MultipleSpreadRecordTests.cs | 2 +- .../Property/Optionality/OptionalityTests.cs | 1 - .../Property/ValueTypes/ValueTypesTests.cs | 9 +- .../Http/_Type/Union/UnionTests.cs | 3 - .../Http/_Type/_Array/ArrayTests.cs | 1 - .../_Type/_Enum/Extensible/ExtensibleTests.cs | 1 - .../Http/_Type/_Enum/Fixed/FixedTests.cs | 1 - .../TestProjects.CadlRanch.Tests.csproj | 74 +++--- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../authentication/api-key/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../http/custom/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../authentication/oauth2/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../authentication/union/tspCodeModel.json | 1 + .../naming/src/Generated/ClientModel.cs | 35 --- .../src/Generated/ClientNamingModelFactory.cs | 19 -- .../Generated/Models/CSModel.Serialization.cs | 36 --- .../naming/src/Generated/Models/CSModel.cs | 13 -- .../Generated/Models/ClientExtensibleEnum.cs | 32 --- .../Models/ClientModel.Serialization.cs | 36 --- .../src/Generated/Models/ClientModel.cs | 13 -- ...meAndJsonEncodedNameModel.Serialization.cs | 36 --- .../ClientNameAndJsonEncodedNameModel.cs | 13 -- .../Models/ClientNameModel.Serialization.cs | 36 --- .../src/Generated/Models/ClientNameModel.cs | 13 -- .../src/Generated/Models/ExtensibleEnum.cs | 34 --- .../LanguageClientNameModel.Serialization.cs | 36 --- .../Models/LanguageClientNameModel.cs | 13 -- .../naming/src/Generated/NamingClient.cs | 82 ------- .../src/Generated/NamingClientOptions.cs | 12 - .../client/naming/src/Generated/UnionEnum.cs | 35 --- .../src/Generated/FirstClient.cs | 4 +- .../src/Generated/Group3.cs | 2 +- .../src/Generated/Group4.cs | 2 +- .../src/Generated/Group5.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/ClientType.cs | 2 +- .../src/Generated/SubNamespaceSecondClient.cs | 4 +- .../client-operation-group/tspCodeModel.json | 6 + .../structure/default/Configuration.json | 2 +- .../structure/default/src/Generated/Bar.cs | 2 +- .../structure/default/src/Generated/Baz.cs | 2 +- .../structure/default/src/Generated/BazFoo.cs | 2 +- .../structure/default/src/Generated/Foo.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/ClientType.cs | 2 +- .../structure/default/src/Generated/Qux.cs | 2 +- .../structure/default/src/Generated/QuxBar.cs | 2 +- .../default/src/Generated/ServiceClient.cs | 5 +- .../src/Generated/ServiceClientOptions.cs | 2 +- .../structure/default/tspCodeModel.json | 8 + .../client/structure/default/tspconfig.yaml | 2 +- .../structure/multi-client/Configuration.json | 2 +- .../src/Generated/ClientAClient.cs | 4 +- .../src/Generated/ClientAClientOptions.cs | 2 +- .../src/Generated/ClientBClient.cs | 4 +- .../src/Generated/ClientBClientOptions.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/ClientType.cs | 2 +- .../structure/multi-client/tspCodeModel.json | 3 + .../structure/multi-client/tspconfig.yaml | 2 +- .../renamed-operation/Configuration.json | 2 +- .../renamed-operation/src/Generated/Group.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/ClientType.cs | 2 +- .../src/Generated/RenamedOperationClient.cs | 4 +- .../RenamedOperationClientOptions.cs | 2 +- .../renamed-operation/tspCodeModel.json | 3 + .../renamed-operation/tspconfig.yaml | 2 +- .../two-operation-group/Configuration.json | 2 +- .../src/Generated/Group1.cs | 2 +- .../src/Generated/Group2.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/ClientType.cs | 2 +- .../src/Generated/TwoOperationGroupClient.cs | 4 +- .../TwoOperationGroupClientOptions.cs | 2 +- .../two-operation-group/tspCodeModel.json | 4 + .../two-operation-group/tspconfig.yaml | 2 +- .../encode/bytes/src/Generated/BytesClient.cs | 5 + .../src/Generated/EncodeBytesModelFactory.cs | 2 +- .../http/encode/bytes/src/Generated/Header.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Base64BytesProperty.Serialization.cs | 2 +- .../Generated/Models/Base64BytesProperty.cs | 2 +- ...se64urlArrayBytesProperty.Serialization.cs | 2 +- .../Models/Base64urlArrayBytesProperty.cs | 2 +- .../Base64urlBytesProperty.Serialization.cs | 2 +- .../Models/Base64urlBytesProperty.cs | 2 +- .../DefaultBytesProperty.Serialization.cs | 2 +- .../Generated/Models/DefaultBytesProperty.cs | 2 +- .../encode/bytes/src/Generated/Property.cs | 4 +- .../http/encode/bytes/src/Generated/Query.cs | 2 +- .../encode/bytes/src/Generated/RequestBody.cs | 2 +- .../bytes/src/Generated/ResponseBody.cs | 2 +- .../http/encode/bytes/tspCodeModel.json | 10 + .../datetime/src/Generated/DatetimeClient.cs | 4 + .../Generated/EncodeDatetimeModelFactory.cs | 2 +- .../encode/datetime/src/Generated/Header.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../DefaultDatetimeProperty.Serialization.cs | 2 +- .../Models/DefaultDatetimeProperty.cs | 2 +- .../Rfc3339DatetimeProperty.Serialization.cs | 2 +- .../Models/Rfc3339DatetimeProperty.cs | 2 +- .../Rfc7231DatetimeProperty.Serialization.cs | 2 +- .../Models/Rfc7231DatetimeProperty.cs | 2 +- ...tampArrayDatetimeProperty.Serialization.cs | 2 +- .../UnixTimestampArrayDatetimeProperty.cs | 2 +- ...TimestampDatetimeProperty.Serialization.cs | 2 +- .../Models/UnixTimestampDatetimeProperty.cs | 2 +- .../encode/datetime/src/Generated/Property.cs | 4 +- .../encode/datetime/src/Generated/Query.cs | 2 +- .../datetime/src/Generated/ResponseHeader.cs | 2 +- .../http/encode/datetime/tspCodeModel.json | 10 + .../duration/src/Generated/DurationClient.cs | 3 + .../Generated/EncodeDurationModelFactory.cs | 3 +- .../encode/duration/src/Generated/Header.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../DefaultDurationProperty.Serialization.cs | 2 +- .../Models/DefaultDurationProperty.cs | 2 +- ...64SecondsDurationProperty.Serialization.cs | 2 +- .../Models/Float64SecondsDurationProperty.cs | 2 +- ...ondsDurationArrayProperty.Serialization.cs | 2 +- .../FloatSecondsDurationArrayProperty.cs | 2 +- ...atSecondsDurationProperty.Serialization.cs | 2 +- .../Models/FloatSecondsDurationProperty.cs | 2 +- .../ISO8601DurationProperty.Serialization.cs | 2 +- .../Models/ISO8601DurationProperty.cs | 2 +- ...32SecondsDurationProperty.Serialization.cs | 2 +- .../Models/Int32SecondsDurationProperty.cs | 2 +- .../encode/duration/src/Generated/Property.cs | 3 +- .../encode/duration/src/Generated/Query.cs | 2 +- .../http/encode/duration/tspCodeModel.json | 10 + .../Generated/EncodeNumericModelFactory.cs | 4 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../SafeintAsStringProperty.Serialization.cs | 2 +- .../Models/SafeintAsStringProperty.cs | 2 +- .../Uint32AsStringProperty.Serialization.cs | 2 +- .../Models/Uint32AsStringProperty.cs | 2 +- .../Uint8AsStringProperty.Serialization.cs | 2 +- .../Generated/Models/Uint8AsStringProperty.cs | 2 +- .../numeric/src/Generated/NumericClient.cs | 1 + .../encode/numeric/src/Generated/Property.cs | 3 +- .../http/encode/numeric/tspCodeModel.json | 5 + .../basic/src/Generated/BasicClient.cs | 2 + .../basic/src/Generated/ExplicitBody.cs | 3 +- .../basic/src/Generated/ImplicitBody.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/Models/User.Serialization.cs | 2 +- .../basic/src/Generated/Models/User.cs | 2 +- .../Generated/ParametersBasicModelFactory.cs | 5 +- .../http/parameters/basic/tspCodeModel.json | 5 + .../src/Generated/BodyOptionalityClient.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/BodyModel.Serialization.cs | 2 +- .../src/Generated/Models/BodyModel.cs | 2 +- .../src/Generated/OptionalExplicit.cs | 4 +- .../ParametersBodyOptionalityModelFactory.cs | 2 +- .../body-optionality/tspCodeModel.json | 3 + .../src/Generated/CollectionFormatClient.cs | 2 + .../collection-format/src/Generated/Header.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../collection-format/src/Generated/Query.cs | 2 +- .../collection-format/tspCodeModel.json | 3 + .../parameters/spread/src/Generated/Alias.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../parameters/spread/src/Generated/Model.cs | 3 +- .../Models/BodyParameter.Serialization.cs | 2 +- .../src/Generated/Models/BodyParameter.cs | 2 +- .../Generated/ParametersSpreadModelFactory.cs | 4 +- .../spread/src/Generated/SpreadClient.cs | 2 + .../http/parameters/spread/tspCodeModel.json | 10 + .../src/Generated/ContentNegotiationClient.cs | 2 + .../src/Generated/DifferentBody.cs | 3 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/PngImageAsJson.Serialization.cs | 2 +- .../src/Generated/Models/PngImageAsJson.cs | 2 +- .../PayloadContentNegotiationModelFactory.cs | 3 +- .../src/Generated/SameBody.cs | 2 +- .../content-negotiation/tspCodeModel.json | 4 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/JsonMergePatchClient.cs | 1 - .../Models/InnerModel.Serialization.cs | 2 +- .../src/Generated/Models/InnerModel.cs | 2 +- .../Models/Resource.Serialization.cs | 2 +- .../src/Generated/Models/Resource.cs | 2 +- .../PayloadJsonMergePatchModelFactory.cs | 2 +- .../json-merge-patch/tspCodeModel.json | 4 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/MediaTypeClient.cs | 1 + .../media-type/src/Generated/StringBody.cs | 2 +- .../http/payload/media-type/tspCodeModel.json | 2 + .../multipart/src/Generated/FormData.cs | 3 +- .../src/Generated/FormDataHttpParts.cs | 4 +- .../Generated/FormDataHttpPartsContentType.cs | 2 +- .../Generated/FormDataHttpPartsNonString.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/MultiPartClient.cs | 1 + .../http/payload/multipart/tspCodeModel.json | 23 ++ .../srv-driven/v1/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../ResiliencyServiceDrivenClient.cs | 2 +- .../ResiliencyServiceDrivenClientOptions.cs | 2 +- .../srv-driven/v1/tspCodeModel.json | 2 + .../srv-driven/v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../ResiliencyServiceDrivenClient.cs | 2 +- .../ResiliencyServiceDrivenClientOptions.cs | 2 +- .../srv-driven/v2/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../routes/src/Generated/PathParameters.cs | 7 +- .../Generated/PathParametersLabelExpansion.cs | 4 +- .../PathParametersLabelExpansionExplode.cs | 2 +- .../PathParametersLabelExpansionStandard.cs | 2 +- .../PathParametersMatrixExpansion.cs | 4 +- .../PathParametersMatrixExpansionExplode.cs | 2 +- .../PathParametersMatrixExpansionStandard.cs | 2 +- .../Generated/PathParametersPathExpansion.cs | 4 +- .../PathParametersPathExpansionExplode.cs | 2 +- .../PathParametersPathExpansionStandard.cs | 2 +- .../PathParametersReservedExpansion.cs | 2 +- .../PathParametersSimpleExpansion.cs | 4 +- .../PathParametersSimpleExpansionExplode.cs | 2 +- .../PathParametersSimpleExpansionStandard.cs | 2 +- .../routes/src/Generated/QueryParameters.cs | 4 +- .../QueryParametersQueryContinuation.cs | 4 +- ...QueryParametersQueryContinuationExplode.cs | 2 +- ...ueryParametersQueryContinuationStandard.cs | 2 +- .../QueryParametersQueryExpansion.cs | 4 +- .../QueryParametersQueryExpansionExplode.cs | 2 +- .../QueryParametersQueryExpansionStandard.cs | 2 +- .../http/routes/src/Generated/RoutesClient.cs | 2 + .../CadlRanch/http/routes/tspCodeModel.json | 23 ++ .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../json/src/Generated/JsonClient.cs | 1 + .../JsonEncodedNameModel.Serialization.cs | 2 +- .../Generated/Models/JsonEncodedNameModel.cs | 2 +- .../json/src/Generated/Property.cs | 3 +- ...erializationEncodedNameJsonModelFactory.cs | 4 +- .../encoded-name/json/tspCodeModel.json | 3 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../endpoint/not-defined/tspCodeModel.json | 1 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../server/path/multiple/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../http/server/path/single/tspCodeModel.json | 1 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../versions/not-versioned/tspCodeModel.json | 1 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../versions/versioned/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../conditional-request/tspCodeModel.json | 1 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../repeatability/tspCodeModel.json | 2 + .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/ModelProperties.cs | 3 +- .../src/Generated/{ModelsOps.cs => Models.cs} | 7 +- .../src/Generated/Models/And.Serialization.cs | 2 +- .../special-words/src/Generated/Models/And.cs | 2 +- .../src/Generated/Models/As.Serialization.cs | 2 +- .../special-words/src/Generated/Models/As.cs | 2 +- .../Generated/Models/Assert.Serialization.cs | 2 +- .../src/Generated/Models/Assert.cs | 2 +- .../Generated/Models/Async.Serialization.cs | 2 +- .../src/Generated/Models/Async.cs | 2 +- .../Generated/Models/Await.Serialization.cs | 2 +- .../src/Generated/Models/Await.cs | 2 +- .../Generated/Models/Break.Serialization.cs | 2 +- .../src/Generated/Models/Break.cs | 2 +- .../Generated/Models/Class.Serialization.cs | 2 +- .../src/Generated/Models/Class.cs | 2 +- .../Models/Constructor.Serialization.cs | 2 +- .../src/Generated/Models/Constructor.cs | 2 +- .../Models/Continue.Serialization.cs | 2 +- .../src/Generated/Models/Continue.cs | 2 +- .../src/Generated/Models/Def.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Def.cs | 2 +- .../src/Generated/Models/Del.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Del.cs | 2 +- .../Generated/Models/Elif.Serialization.cs | 2 +- .../src/Generated/Models/Elif.cs | 2 +- .../Generated/Models/Else.Serialization.cs | 2 +- .../src/Generated/Models/Else.cs | 2 +- .../Generated/Models/Except.Serialization.cs | 2 +- .../src/Generated/Models/Except.cs | 2 +- .../Generated/Models/Exec.Serialization.cs | 2 +- .../src/Generated/Models/Exec.cs | 2 +- .../Generated/Models/Finally.Serialization.cs | 2 +- .../src/Generated/Models/Finally.cs | 2 +- .../src/Generated/Models/For.Serialization.cs | 2 +- .../special-words/src/Generated/Models/For.cs | 2 +- .../Generated/Models/From.Serialization.cs | 2 +- .../src/Generated/Models/From.cs | 2 +- .../Generated/Models/Global.Serialization.cs | 2 +- .../src/Generated/Models/Global.cs | 2 +- .../src/Generated/Models/If.Serialization.cs | 2 +- .../special-words/src/Generated/Models/If.cs | 2 +- .../Generated/Models/Import.Serialization.cs | 2 +- .../src/Generated/Models/Import.cs | 2 +- .../src/Generated/Models/In.Serialization.cs | 2 +- .../special-words/src/Generated/Models/In.cs | 2 +- .../src/Generated/Models/Is.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Is.cs | 2 +- .../Generated/Models/Lambda.Serialization.cs | 2 +- .../src/Generated/Models/Lambda.cs | 2 +- .../src/Generated/Models/Not.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Not.cs | 2 +- .../src/Generated/Models/Or.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Or.cs | 2 +- .../Generated/Models/Pass.Serialization.cs | 2 +- .../src/Generated/Models/Pass.cs | 2 +- .../Generated/Models/Raise.Serialization.cs | 2 +- .../src/Generated/Models/Raise.cs | 2 +- .../Generated/Models/Return.Serialization.cs | 2 +- .../src/Generated/Models/Return.cs | 2 +- .../Models/SameAsModel.Serialization.cs | 2 +- .../src/Generated/Models/SameAsModel.cs | 2 +- .../src/Generated/Models/Try.Serialization.cs | 2 +- .../special-words/src/Generated/Models/Try.cs | 2 +- .../Generated/Models/While.Serialization.cs | 2 +- .../src/Generated/Models/While.cs | 2 +- .../Generated/Models/With.Serialization.cs | 2 +- .../src/Generated/Models/With.cs | 2 +- .../Generated/Models/Yield.Serialization.cs | 2 +- .../src/Generated/Models/Yield.cs | 2 +- .../src/Generated/SpecialWordsClient.cs | 4 +- .../src/Generated/SpecialWordsModelFactory.cs | 5 +- .../http/special-words/tspCodeModel.json | 41 +++- .../{_Type._Array.sln => Type.Array.sln} | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../type/array/src/Generated/ModelValue.cs | 1 - .../Models/InnerModel.Serialization.cs | 2 +- .../array/src/Generated/Models/InnerModel.cs | 2 +- .../array/src/Generated/NullableModelValue.cs | 1 - .../src/Generated/TypeArrayModelFactory.cs | 2 +- ...{_Type._Array.csproj => Type.Array.csproj} | 6 +- .../http/type/array/tspCodeModel.json | 31 ++- .../dictionary/Type.Dictionary.sln} | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../dictionary/src/Generated/ModelValue.cs | 1 - .../Models/InnerModel.Serialization.cs | 2 +- .../src/Generated/Models/InnerModel.cs | 2 +- .../src/Generated/RecursiveModelValue.cs | 1 - .../Generated/TypeDictionaryModelFactory.cs | 2 +- .../dictionary/src/Type.Dictionary.csproj} | 6 +- .../http/type/dictionary/tspCodeModel.json | 16 +- .../Type.Enum.Extensible.sln} | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/DaysOfWeekExtensibleEnum.cs | 2 +- .../enum/extensible/src/Generated/String.cs | 1 - .../src/Type.Enum.Extensible.csproj} | 6 +- .../type/enum/extensible/tspCodeModel.json | 3 + .../http/type/enum/fixed/Type.Enum.Fixed.sln | 48 ++++ .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/DaysOfWeekEnum.cs | 2 +- .../type/enum/fixed/src/Generated/String.cs | 1 - .../enum/fixed/src/Type.Enum.Fixed.csproj | 16 ++ .../http/type/enum/fixed/tspCodeModel.json | 3 + .../empty/Type.Model.Empty.sln} | 2 +- .../type/model/empty/_Type.Model.Empty.sln | 48 ---- .../model/empty/src/Generated/EmptyClient.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/EmptyInput.Serialization.cs | 2 +- .../empty/src/Generated/Models/EmptyInput.cs | 2 +- .../Models/EmptyInputOutput.Serialization.cs | 2 +- .../src/Generated/Models/EmptyInputOutput.cs | 2 +- .../Models/EmptyOutput.Serialization.cs | 2 +- .../empty/src/Generated/Models/EmptyOutput.cs | 2 +- .../Generated/TypeModelEmptyModelFactory.cs | 2 +- .../empty/src/Type.Model.Empty.csproj} | 6 +- .../model/empty/src/_Type.Model.Empty.csproj | 16 -- .../http/type/model/empty/tspCodeModel.json | 4 + ...pe.Model.Inheritance.EnumDiscriminator.sln | 48 ++++ ...pe.Model.Inheritance.EnumDiscriminator.sln | 48 ---- .../src/Generated/EnumDiscriminatorClient.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/Models/Cobra.Serialization.cs | 2 +- .../src/Generated/Models/Cobra.cs | 2 +- .../src/Generated/Models/Dog.Serialization.cs | 2 +- .../src/Generated/Models/Dog.cs | 2 +- .../src/Generated/Models/DogKind.cs | 2 +- .../Generated/Models/Golden.Serialization.cs | 2 +- .../src/Generated/Models/Golden.cs | 2 +- .../Generated/Models/Snake.Serialization.cs | 2 +- .../src/Generated/Models/Snake.cs | 2 +- .../src/Generated/Models/SnakeKind.cs | 2 +- .../Models/UnknownDog.Serialization.cs | 2 +- .../src/Generated/Models/UnknownDog.cs | 2 +- .../Models/UnknownSnake.Serialization.cs | 2 +- .../src/Generated/Models/UnknownSnake.cs | 2 +- ...nheritanceEnumDiscriminatorModelFactory.cs | 2 +- ...odel.Inheritance.EnumDiscriminator.csproj} | 6 +- ...Model.Inheritance.EnumDiscriminator.csproj | 16 -- .../enum-discriminator/tspCodeModel.json | 7 + ....Model.Inheritance.NestedDiscriminator.sln | 48 ++++ ....Model.Inheritance.NestedDiscriminator.sln | 48 ---- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/Models/Fish.Serialization.cs | 2 +- .../src/Generated/Models/Fish.cs | 2 +- .../Models/GoblinShark.Serialization.cs | 2 +- .../src/Generated/Models/GoblinShark.cs | 2 +- .../Generated/Models/Salmon.Serialization.cs | 2 +- .../src/Generated/Models/Salmon.cs | 2 +- .../Models/SawShark.Serialization.cs | 2 +- .../src/Generated/Models/SawShark.cs | 2 +- .../Generated/Models/Shark.Serialization.cs | 2 +- .../src/Generated/Models/Shark.cs | 2 +- .../Models/UnknownFish.Serialization.cs | 2 +- .../src/Generated/Models/UnknownFish.cs | 2 +- .../Models/UnknownShark.Serialization.cs | 2 +- .../src/Generated/Models/UnknownShark.cs | 2 +- .../Generated/NestedDiscriminatorClient.cs | 1 - ...eritanceNestedDiscriminatorModelFactory.cs | 2 +- ...del.Inheritance.NestedDiscriminator.csproj | 16 ++ ...del.Inheritance.NestedDiscriminator.csproj | 16 -- .../nested-discriminator/tspCodeModel.json | 6 + ...ype.Model.Inheritance.NotDiscriminated.sln | 48 ++++ ...ype.Model.Inheritance.NotDiscriminated.sln | 48 ---- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/Models/Cat.Serialization.cs | 2 +- .../src/Generated/Models/Cat.cs | 2 +- .../src/Generated/Models/Pet.Serialization.cs | 2 +- .../src/Generated/Models/Pet.cs | 2 +- .../Generated/Models/Siamese.Serialization.cs | 2 +- .../src/Generated/Models/Siamese.cs | 2 +- .../src/Generated/NotDiscriminatedClient.cs | 1 - ...InheritanceNotDiscriminatedModelFactory.cs | 2 +- ....Model.Inheritance.NotDiscriminated.csproj | 16 ++ .../not-discriminated/tspCodeModel.json | 4 + .../Type.Model.Inheritance.Recursive.sln | 48 ++++ .../_Type.Model.Inheritance.Recursive.sln | 48 ---- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/Models/Element.Serialization.cs | 2 +- .../recursive/src/Generated/Models/Element.cs | 2 +- .../Models/Extension.Serialization.cs | 2 +- .../src/Generated/Models/Extension.cs | 2 +- .../src/Generated/RecursiveClient.cs | 1 - ...peModelInheritanceRecursiveModelFactory.cs | 2 +- .../Type.Model.Inheritance.Recursive.csproj | 16 ++ .../_Type.Model.Inheritance.Recursive.csproj | 16 -- .../inheritance/recursive/tspCodeModel.json | 3 + ....Model.Inheritance.SingleDiscriminator.sln | 48 ++++ ....Model.Inheritance.SingleDiscriminator.sln | 48 ---- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/Models/Bird.Serialization.cs | 2 +- .../src/Generated/Models/Bird.cs | 2 +- .../Models/Dinosaur.Serialization.cs | 2 +- .../src/Generated/Models/Dinosaur.cs | 2 +- .../Generated/Models/Eagle.Serialization.cs | 2 +- .../src/Generated/Models/Eagle.cs | 2 +- .../Generated/Models/Goose.Serialization.cs | 2 +- .../src/Generated/Models/Goose.cs | 2 +- .../Generated/Models/SeaGull.Serialization.cs | 2 +- .../src/Generated/Models/SeaGull.cs | 2 +- .../Generated/Models/Sparrow.Serialization.cs | 2 +- .../src/Generated/Models/Sparrow.cs | 2 +- .../Generated/Models/TRex.Serialization.cs | 2 +- .../src/Generated/Models/TRex.cs | 2 +- .../Models/UnknownBird.Serialization.cs | 2 +- .../src/Generated/Models/UnknownBird.cs | 2 +- .../Models/UnknownDinosaur.Serialization.cs | 2 +- .../src/Generated/Models/UnknownDinosaur.cs | 2 +- .../Generated/SingleDiscriminatorClient.cs | 1 - ...eritanceSingleDiscriminatorModelFactory.cs | 2 +- ...del.Inheritance.SingleDiscriminator.csproj | 16 ++ ...del.Inheritance.SingleDiscriminator.csproj | 16 -- .../single-discriminator/tspCodeModel.json | 8 + .../type/model/usage/Type.Model.Usage.sln | 48 ++++ .../type/model/usage/_Type.Model.Usage.sln | 48 ---- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/InputOutputRecord.Serialization.cs | 2 +- .../src/Generated/Models/InputOutputRecord.cs | 2 +- .../Models/InputRecord.Serialization.cs | 2 +- .../usage/src/Generated/Models/InputRecord.cs | 2 +- .../Models/OutputRecord.Serialization.cs | 2 +- .../src/Generated/Models/OutputRecord.cs | 2 +- .../Generated/TypeModelUsageModelFactory.cs | 2 +- .../model/usage/src/Generated/UsageClient.cs | 1 - .../model/usage/src/Type.Model.Usage.csproj | 16 ++ .../model/usage/src/_Type.Model.Usage.csproj | 16 -- .../http/type/model/usage/tspCodeModel.json | 4 + .../visibility/Type.Model.Visibility.sln | 48 ++++ .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/ReadOnlyModel.Serialization.cs | 2 +- .../src/Generated/Models/ReadOnlyModel.cs | 2 +- .../Models/VisibilityModel.Serialization.cs | 2 +- .../src/Generated/Models/VisibilityModel.cs | 2 +- .../TypeModelVisibilityModelFactory.cs | 2 +- .../src/Generated/VisibilityClient.cs | 1 - .../src/Type.Model.Visibility.csproj | 16 ++ .../type/model/visibility/tspCodeModel.json | 6 +- .../Type.Property.AdditionalProperties.sln | 48 ++++ .../_Type.Property.AdditionalProperties.sln | 48 ---- .../Generated/ExtendsDifferentSpreadFloat.cs | 1 - .../Generated/ExtendsDifferentSpreadModel.cs | 1 - .../ExtendsDifferentSpreadModelArray.cs | 1 - .../Generated/ExtendsDifferentSpreadString.cs | 1 - .../src/Generated/ExtendsFloat.cs | 1 - .../src/Generated/ExtendsModel.cs | 1 - .../src/Generated/ExtendsModelArray.cs | 1 - .../src/Generated/ExtendsString.cs | 1 - .../src/Generated/ExtendsUnknown.cs | 1 - .../src/Generated/ExtendsUnknownDerived.cs | 1 - .../Generated/ExtendsUnknownDiscriminated.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Generated/IsFloat.cs | 1 - .../src/Generated/IsModel.cs | 1 - .../src/Generated/IsModelArray.cs | 1 - .../src/Generated/IsString.cs | 1 - .../src/Generated/IsUnknown.cs | 1 - .../src/Generated/IsUnknownDerived.cs | 1 - .../src/Generated/IsUnknownDiscriminated.cs | 1 - ...fferentSpreadFloatDerived.Serialization.cs | 2 +- .../Models/DifferentSpreadFloatDerived.cs | 2 +- ...ifferentSpreadFloatRecord.Serialization.cs | 2 +- .../Models/DifferentSpreadFloatRecord.cs | 2 +- ...ntSpreadModelArrayDerived.Serialization.cs | 2 +- .../DifferentSpreadModelArrayDerived.cs | 2 +- ...entSpreadModelArrayRecord.Serialization.cs | 2 +- .../Models/DifferentSpreadModelArrayRecord.cs | 2 +- ...fferentSpreadModelDerived.Serialization.cs | 2 +- .../Models/DifferentSpreadModelDerived.cs | 2 +- ...ifferentSpreadModelRecord.Serialization.cs | 2 +- .../Models/DifferentSpreadModelRecord.cs | 2 +- ...ferentSpreadStringDerived.Serialization.cs | 2 +- .../Models/DifferentSpreadStringDerived.cs | 2 +- ...fferentSpreadStringRecord.Serialization.cs | 2 +- .../Models/DifferentSpreadStringRecord.cs | 2 +- ...FloatAdditionalProperties.Serialization.cs | 2 +- .../ExtendsFloatAdditionalProperties.cs | 2 +- ...ModelAdditionalProperties.Serialization.cs | 2 +- .../ExtendsModelAdditionalProperties.cs | 2 +- ...ArrayAdditionalProperties.Serialization.cs | 2 +- .../ExtendsModelArrayAdditionalProperties.cs | 2 +- ...tringAdditionalProperties.Serialization.cs | 2 +- .../ExtendsStringAdditionalProperties.cs | 2 +- ...knownAdditionalProperties.Serialization.cs | 2 +- .../ExtendsUnknownAdditionalProperties.cs | 2 +- ...ditionalPropertiesDerived.Serialization.cs | 2 +- ...tendsUnknownAdditionalPropertiesDerived.cs | 2 +- ...alPropertiesDiscriminated.Serialization.cs | 2 +- ...nknownAdditionalPropertiesDiscriminated.cs | 2 +- ...rtiesDiscriminatedDerived.Serialization.cs | 2 +- ...dditionalPropertiesDiscriminatedDerived.cs | 2 +- ...FloatAdditionalProperties.Serialization.cs | 2 +- .../Models/IsFloatAdditionalProperties.cs | 2 +- ...ModelAdditionalProperties.Serialization.cs | 2 +- .../Models/IsModelAdditionalProperties.cs | 2 +- ...ArrayAdditionalProperties.Serialization.cs | 2 +- .../IsModelArrayAdditionalProperties.cs | 2 +- ...tringAdditionalProperties.Serialization.cs | 2 +- .../Models/IsStringAdditionalProperties.cs | 2 +- ...knownAdditionalProperties.Serialization.cs | 2 +- .../Models/IsUnknownAdditionalProperties.cs | 2 +- ...ditionalPropertiesDerived.Serialization.cs | 2 +- .../IsUnknownAdditionalPropertiesDerived.cs | 2 +- ...alPropertiesDiscriminated.Serialization.cs | 2 +- ...nknownAdditionalPropertiesDiscriminated.cs | 2 +- ...rtiesDiscriminatedDerived.Serialization.cs | 2 +- ...dditionalPropertiesDiscriminatedDerived.cs | 2 +- .../Models/ModelForRecord.Serialization.cs | 2 +- .../src/Generated/Models/ModelForRecord.cs | 2 +- .../MultipleSpreadRecord.Serialization.cs | 2 +- .../Generated/Models/MultipleSpreadRecord.cs | 2 +- .../Models/SpreadFloatRecord.Serialization.cs | 2 +- .../src/Generated/Models/SpreadFloatRecord.cs | 2 +- .../SpreadModelArrayRecord.Serialization.cs | 2 +- .../Models/SpreadModelArrayRecord.cs | 2 +- .../Models/SpreadModelRecord.Serialization.cs | 2 +- .../src/Generated/Models/SpreadModelRecord.cs | 2 +- ...cordForDiscriminatedUnion.Serialization.cs | 2 +- .../SpreadRecordForDiscriminatedUnion.cs | 2 +- ...dForNonDiscriminatedUnion.Serialization.cs | 2 +- .../SpreadRecordForNonDiscriminatedUnion.cs | 2 +- ...ForNonDiscriminatedUnion2.Serialization.cs | 2 +- .../SpreadRecordForNonDiscriminatedUnion2.cs | 2 +- ...ForNonDiscriminatedUnion3.Serialization.cs | 2 +- .../SpreadRecordForNonDiscriminatedUnion3.cs | 2 +- .../SpreadRecordForUnion.Serialization.cs | 2 +- .../Generated/Models/SpreadRecordForUnion.cs | 2 +- .../SpreadStringRecord.Serialization.cs | 2 +- .../Generated/Models/SpreadStringRecord.cs | 2 +- ...alPropertiesDiscriminated.Serialization.cs | 2 +- ...nknownAdditionalPropertiesDiscriminated.cs | 2 +- ...alPropertiesDiscriminated.Serialization.cs | 2 +- ...nknownAdditionalPropertiesDiscriminated.cs | 2 +- .../Models/WidgetData0.Serialization.cs | 2 +- .../src/Generated/Models/WidgetData0.cs | 2 +- .../src/Generated/Models/WidgetData0Kind.cs | 2 +- .../Models/WidgetData1.Serialization.cs | 2 +- .../src/Generated/Models/WidgetData1.cs | 2 +- .../src/Generated/Models/WidgetData1Kind.cs | 2 +- .../Models/WidgetData2.Serialization.cs | 2 +- .../src/Generated/Models/WidgetData2.cs | 2 +- .../src/Generated/Models/WidgetData2Kind.cs | 2 +- .../src/Generated/MultipleSpread.cs | 1 - .../src/Generated/SpreadDifferentFloat.cs | 1 - .../src/Generated/SpreadDifferentModel.cs | 1 - .../Generated/SpreadDifferentModelArray.cs | 1 - .../src/Generated/SpreadDifferentString.cs | 1 - .../src/Generated/SpreadFloat.cs | 1 - .../src/Generated/SpreadModel.cs | 1 - .../src/Generated/SpreadModelArray.cs | 1 - .../SpreadRecordDiscriminatedUnion.cs | 1 - .../SpreadRecordNonDiscriminatedUnion.cs | 1 - .../SpreadRecordNonDiscriminatedUnion2.cs | 1 - .../SpreadRecordNonDiscriminatedUnion3.cs | 1 - .../src/Generated/SpreadRecordUnion.cs | 1 - .../src/Generated/SpreadString.cs | 1 - ...ropertyAdditionalPropertiesModelFactory.cs | 2 +- .../Type.Property.AdditionalProperties.csproj | 16 ++ ..._Type.Property.AdditionalProperties.csproj | 16 -- .../additional-properties/tspCodeModel.json | 80 +++++++ .../nullable/Type.Property.Nullable.sln} | 2 +- .../nullable/_Type.Property.Nullable.sln | 48 ---- .../property/nullable/src/Generated/Bytes.cs | 1 - .../nullable/src/Generated/CollectionsByte.cs | 1 - .../src/Generated/CollectionsModel.cs | 1 - .../src/Generated/CollectionsString.cs | 1 - .../nullable/src/Generated/Datetime.cs | 1 - .../nullable/src/Generated/Duration.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/BytesProperty.Serialization.cs | 2 +- .../src/Generated/Models/BytesProperty.cs | 2 +- .../CollectionsByteProperty.Serialization.cs | 2 +- .../Models/CollectionsByteProperty.cs | 2 +- .../CollectionsModelProperty.Serialization.cs | 2 +- .../Models/CollectionsModelProperty.cs | 2 +- ...CollectionsStringProperty.Serialization.cs | 2 +- .../Models/CollectionsStringProperty.cs | 2 +- .../Models/DatetimeProperty.Serialization.cs | 2 +- .../src/Generated/Models/DatetimeProperty.cs | 2 +- .../Models/DurationProperty.Serialization.cs | 2 +- .../src/Generated/Models/DurationProperty.cs | 2 +- .../Models/InnerModel.Serialization.cs | 2 +- .../src/Generated/Models/InnerModel.cs | 2 +- .../Models/StringProperty.Serialization.cs | 2 +- .../src/Generated/Models/StringProperty.cs | 2 +- .../property/nullable/src/Generated/String.cs | 1 - .../TypePropertyNullableModelFactory.cs | 2 +- .../src/Type.Property.Nullable.csproj} | 6 +- .../src/_Type.Property.Nullable.csproj | 16 -- .../type/property/nullable/tspCodeModel.json | 37 ++- .../optionality/Type.Property.Optional.sln} | 2 +- .../optionality/_Type.Property.Optional.sln | 48 ---- .../src/Generated/BooleanLiteral.cs | 1 - .../optionality/src/Generated/Bytes.cs | 1 - .../src/Generated/CollectionsByte.cs | 1 - .../src/Generated/CollectionsModel.cs | 1 - .../optionality/src/Generated/Datetime.cs | 1 - .../optionality/src/Generated/Duration.cs | 1 - .../optionality/src/Generated/FloatLiteral.cs | 1 - .../optionality/src/Generated/IntLiteral.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../BooleanLiteralProperty.Serialization.cs | 2 +- .../Models/BooleanLiteralProperty.cs | 2 +- .../Models/BytesProperty.Serialization.cs | 2 +- .../src/Generated/Models/BytesProperty.cs | 2 +- .../CollectionsByteProperty.Serialization.cs | 2 +- .../Models/CollectionsByteProperty.cs | 2 +- .../CollectionsModelProperty.Serialization.cs | 2 +- .../Models/CollectionsModelProperty.cs | 2 +- .../Models/DatetimeProperty.Serialization.cs | 2 +- .../src/Generated/Models/DatetimeProperty.cs | 2 +- .../Models/DurationProperty.Serialization.cs | 2 +- .../src/Generated/Models/DurationProperty.cs | 2 +- .../FloatLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/FloatLiteralProperty.cs | 2 +- ...atLiteralPropertyProperty.Serialization.cs | 2 +- .../Models/FloatLiteralPropertyProperty.cs | 2 +- .../IntLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/IntLiteralProperty.cs | 2 +- ...ntLiteralPropertyProperty.Serialization.cs | 2 +- .../Models/IntLiteralPropertyProperty.cs | 2 +- .../Models/PlainDateProperty.Serialization.cs | 2 +- .../src/Generated/Models/PlainDateProperty.cs | 2 +- .../Models/PlainTimeProperty.Serialization.cs | 2 +- .../src/Generated/Models/PlainTimeProperty.cs | 2 +- ...quiredAndOptionalProperty.Serialization.cs | 2 +- .../Models/RequiredAndOptionalProperty.cs | 2 +- .../StringLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/StringLiteralProperty.cs | 2 +- .../Models/StringLiteralPropertyProperty.cs | 2 +- .../Models/StringProperty.Serialization.cs | 2 +- .../src/Generated/Models/StringProperty.cs | 2 +- ...UnionFloatLiteralProperty.Serialization.cs | 2 +- .../Models/UnionFloatLiteralProperty.cs | 2 +- .../UnionFloatLiteralPropertyProperty.cs | 2 +- .../UnionIntLiteralProperty.Serialization.cs | 2 +- .../Models/UnionIntLiteralProperty.cs | 2 +- .../Models/UnionIntLiteralPropertyProperty.cs | 2 +- ...nionStringLiteralProperty.Serialization.cs | 2 +- .../Models/UnionStringLiteralProperty.cs | 2 +- .../UnionStringLiteralPropertyProperty.cs | 2 +- .../optionality/src/Generated/PlainDate.cs | 1 - .../optionality/src/Generated/PlainTime.cs | 1 - .../src/Generated/RequiredAndOptional.cs | 1 - .../optionality/src/Generated/String.cs | 1 - .../src/Generated/StringLiteral.cs | 1 - .../TypePropertyOptionalModelFactory.cs | 2 +- .../src/Generated/UnionFloatLiteral.cs | 1 - .../src/Generated/UnionIntLiteral.cs | 1 - .../src/Generated/UnionStringLiteral.cs | 1 - .../src/Type.Property.Optional.csproj} | 6 +- .../src/_Type.Property.Optional.csproj | 16 -- .../property/optionality/tspCodeModel.json | 39 ++++ .../value-types/Type.Property.ValueTypes.sln | 48 ++++ .../value-types/_Type.Property.ValueTypes.sln | 48 ---- .../value-types/src/Generated/Boolean.cs | 1 - .../src/Generated/BooleanLiteral.cs | 1 - .../value-types/src/Generated/Bytes.cs | 1 - .../src/Generated/CollectionsInt.cs | 1 - .../src/Generated/CollectionsModel.cs | 1 - .../src/Generated/CollectionsString.cs | 1 - .../value-types/src/Generated/Datetime.cs | 1 - .../value-types/src/Generated/Decimal.cs | 1 - .../value-types/src/Generated/Decimal128.cs | 1 - .../src/Generated/DictionaryString.cs | 1 - .../value-types/src/Generated/Duration.cs | 1 - .../value-types/src/Generated/Enum.cs | 1 - .../src/Generated/ExtensibleEnum.cs | 1 - .../value-types/src/Generated/Float.cs | 1 - .../value-types/src/Generated/FloatLiteral.cs | 1 - .../property/value-types/src/Generated/Int.cs | 1 - .../value-types/src/Generated/IntLiteral.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../value-types/src/Generated/Model.cs | 1 - .../BooleanLiteralProperty.Serialization.cs | 2 +- .../Models/BooleanLiteralProperty.cs | 2 +- .../Models/BooleanProperty.Serialization.cs | 2 +- .../src/Generated/Models/BooleanProperty.cs | 2 +- .../Models/BytesProperty.Serialization.cs | 2 +- .../src/Generated/Models/BytesProperty.cs | 2 +- .../CollectionsIntProperty.Serialization.cs | 2 +- .../Models/CollectionsIntProperty.cs | 2 +- .../CollectionsModelProperty.Serialization.cs | 2 +- .../Models/CollectionsModelProperty.cs | 2 +- ...CollectionsStringProperty.Serialization.cs | 2 +- .../Models/CollectionsStringProperty.cs | 2 +- .../Models/DatetimeProperty.Serialization.cs | 2 +- .../src/Generated/Models/DatetimeProperty.cs | 2 +- .../Decimal128Property.Serialization.cs | 2 +- .../Generated/Models/Decimal128Property.cs | 2 +- .../Models/DecimalProperty.Serialization.cs | 2 +- .../src/Generated/Models/DecimalProperty.cs | 2 +- .../DictionaryStringProperty.Serialization.cs | 2 +- .../Models/DictionaryStringProperty.cs | 2 +- .../Models/DurationProperty.Serialization.cs | 2 +- .../src/Generated/Models/DurationProperty.cs | 2 +- .../Models/EnumProperty.Serialization.cs | 2 +- .../src/Generated/Models/EnumProperty.cs | 2 +- .../src/Generated/Models/ExtendedEnum.cs | 2 +- .../ExtensibleEnumProperty.Serialization.cs | 2 +- .../Models/ExtensibleEnumProperty.cs | 2 +- .../src/Generated/Models/FixedInnerEnum.cs | 2 +- .../FloatLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/FloatLiteralProperty.cs | 2 +- ...atLiteralPropertyProperty.Serialization.cs | 2 +- .../Models/FloatLiteralPropertyProperty.cs | 2 +- .../Models/FloatProperty.Serialization.cs | 2 +- .../src/Generated/Models/FloatProperty.cs | 2 +- .../src/Generated/Models/InnerEnum.cs | 2 +- .../Models/InnerModel.Serialization.cs | 2 +- .../src/Generated/Models/InnerModel.cs | 2 +- .../IntLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/IntLiteralProperty.cs | 2 +- ...ntLiteralPropertyProperty.Serialization.cs | 2 +- .../Models/IntLiteralPropertyProperty.cs | 2 +- .../Models/IntProperty.Serialization.cs | 2 +- .../src/Generated/Models/IntProperty.cs | 2 +- .../Models/ModelProperty.Serialization.cs | 2 +- .../src/Generated/Models/ModelProperty.cs | 2 +- .../Models/NeverProperty.Serialization.cs | 2 +- .../src/Generated/Models/NeverProperty.cs | 2 +- .../StringLiteralProperty.Serialization.cs | 2 +- .../Generated/Models/StringLiteralProperty.cs | 2 +- .../Models/StringLiteralPropertyProperty.cs | 2 +- .../Models/StringProperty.Serialization.cs | 2 +- .../src/Generated/Models/StringProperty.cs | 2 +- .../UnionEnumValueProperty.Serialization.cs | 2 +- .../Models/UnionEnumValueProperty.cs | 2 +- ...UnionFloatLiteralProperty.Serialization.cs | 2 +- .../Models/UnionFloatLiteralProperty.cs | 2 +- .../UnionFloatLiteralPropertyProperty.cs | 2 +- .../UnionIntLiteralProperty.Serialization.cs | 2 +- .../Models/UnionIntLiteralProperty.cs | 2 +- .../Models/UnionIntLiteralPropertyProperty.cs | 2 +- ...nionStringLiteralProperty.Serialization.cs | 2 +- .../Models/UnionStringLiteralProperty.cs | 2 +- .../UnionStringLiteralPropertyProperty.cs | 2 +- .../UnknownArrayProperty.Serialization.cs | 2 +- .../Generated/Models/UnknownArrayProperty.cs | 2 +- .../UnknownDictProperty.Serialization.cs | 2 +- .../Generated/Models/UnknownDictProperty.cs | 2 +- .../UnknownIntProperty.Serialization.cs | 2 +- .../Generated/Models/UnknownIntProperty.cs | 2 +- .../UnknownStringProperty.Serialization.cs | 2 +- .../Generated/Models/UnknownStringProperty.cs | 2 +- .../value-types/src/Generated/Never.cs | 1 - .../value-types/src/Generated/String.cs | 1 - .../src/Generated/StringLiteral.cs | 1 - .../TypePropertyValueTypesModelFactory.cs | 2 +- .../src/Generated/UnionEnumValue.cs | 1 - .../src/Generated/UnionFloatLiteral.cs | 1 - .../src/Generated/UnionIntLiteral.cs | 1 - .../src/Generated/UnionStringLiteral.cs | 1 - .../value-types/src/Generated/UnknownArray.cs | 1 - .../value-types/src/Generated/UnknownDict.cs | 1 - .../value-types/src/Generated/UnknownInt.cs | 1 - .../src/Generated/UnknownString.cs | 1 - .../src/Type.Property.ValueTypes.csproj | 16 ++ .../src/_Type.Property.ValueTypes.csproj | 16 -- .../property/value-types/tspCodeModel.json | 69 ++++++ .../Type.Scalar.sln} | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../src/Type.Scalar.csproj} | 6 +- .../http/type/scalar/tspCodeModel.json | 8 + .../_Type.Scalar.sln => union/Type.Union.sln} | 2 +- .../type/union/src/Generated/EnumsOnly.cs | 1 - .../type/union/src/Generated/FloatsOnly.cs | 1 - .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../http/type/union/src/Generated/IntsOnly.cs | 1 - .../type/union/src/Generated/MixedLiterals.cs | 1 - .../type/union/src/Generated/MixedTypes.cs | 1 - .../src/Generated/Models/Cat.Serialization.cs | 2 +- .../type/union/src/Generated/Models/Cat.cs | 2 +- .../src/Generated/Models/Dog.Serialization.cs | 2 +- .../type/union/src/Generated/Models/Dog.cs | 2 +- .../Models/EnumsOnlyCases.Serialization.cs | 2 +- .../src/Generated/Models/EnumsOnlyCases.cs | 2 +- .../src/Generated/Models/EnumsOnlyCasesLr.cs | 2 +- .../src/Generated/Models/EnumsOnlyCasesUd.cs | 2 +- .../Models/GetResponse.Serialization.cs | 2 +- .../union/src/Generated/Models/GetResponse.cs | 2 +- .../Models/GetResponse1.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse1.cs | 2 +- .../Models/GetResponse2.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse2.cs | 2 +- .../Models/GetResponse3.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse3.cs | 2 +- .../Models/GetResponse4.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse4.cs | 2 +- .../Models/GetResponse5.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse5.cs | 2 +- .../Models/GetResponse6.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse6.cs | 2 +- .../Models/GetResponse7.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse7.cs | 2 +- .../Models/GetResponse8.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse8.cs | 2 +- .../Models/GetResponse9.Serialization.cs | 2 +- .../src/Generated/Models/GetResponse9.cs | 2 +- .../src/Generated/Models/GetResponseProp1.cs | 2 +- .../src/Generated/Models/GetResponseProp2.cs | 2 +- .../src/Generated/Models/GetResponseProp3.cs | 2 +- .../src/Generated/Models/GetResponseProp4.cs | 2 +- .../MixedLiteralsCases.Serialization.cs | 2 +- .../Generated/Models/MixedLiteralsCases.cs | 2 +- .../Models/MixedTypesCases.Serialization.cs | 2 +- .../src/Generated/Models/MixedTypesCases.cs | 2 +- .../StringAndArrayCases.Serialization.cs | 2 +- .../Generated/Models/StringAndArrayCases.cs | 2 +- .../Models/StringExtensibleNamedUnion.cs | 2 +- .../type/union/src/Generated/ModelsOnly.cs | 1 - .../union/src/Generated/StringAndArray.cs | 1 - .../union/src/Generated/StringExtensible.cs | 1 - .../src/Generated/StringExtensibleNamed.cs | 1 - .../type/union/src/Generated/StringsOnly.cs | 1 - .../src/Generated/TypeUnionModelFactory.cs | 2 +- .../src/Type.Union.csproj} | 6 +- .../http/type/union/tspCodeModel.json | 49 ++++ .../versioning/added/v1/Configuration.json | 2 +- .../added/v1/src/Generated/AddedClient.cs | 3 +- .../v1/src/Generated/AddedClientOptions.cs | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../added/v1/src/Generated/Models/EnumV1.cs | 2 +- .../Generated/Models/ModelV1.Serialization.cs | 2 +- .../added/v1/src/Generated/Models/ModelV1.cs | 2 +- .../VersioningAddedV1ModelFactory.cs | 2 +- .../versioning/added/v1/tspCodeModel.json | 4 + .../versioning/added/v2/Configuration.json | 2 +- .../added/v2/src/Generated/AddedClient.cs | 3 +- .../v2/src/Generated/AddedClientOptions.cs | 2 +- .../added/v2/src/Generated/InterfaceV2.cs | 3 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../added/v2/src/Generated/Models/EnumV1.cs | 2 +- .../added/v2/src/Generated/Models/EnumV2.cs | 2 +- .../Generated/Models/ModelV1.Serialization.cs | 2 +- .../added/v2/src/Generated/Models/ModelV1.cs | 2 +- .../Generated/Models/ModelV2.Serialization.cs | 2 +- .../added/v2/src/Generated/Models/ModelV2.cs | 2 +- .../VersioningAddedV2ModelFactory.cs | 2 +- .../versioning/added/v2/tspCodeModel.json | 9 + .../madeOptional/v1/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../v1/src/Generated/MadeOptionalClient.cs | 3 +- .../Generated/MadeOptionalClientOptions.cs | 2 +- .../Models/TestModel.Serialization.cs | 2 +- .../v1/src/Generated/Models/TestModel.cs | 2 +- .../VersioningMadeOptionalV1ModelFactory.cs | 2 +- .../madeOptional/v1/tspCodeModel.json | 3 + .../madeOptional/v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../v2/src/Generated/MadeOptionalClient.cs | 3 +- .../Generated/MadeOptionalClientOptions.cs | 2 +- .../Models/TestModel.Serialization.cs | 2 +- .../v2/src/Generated/Models/TestModel.cs | 2 +- .../VersioningMadeOptionalV2ModelFactory.cs | 2 +- .../madeOptional/v2/tspCodeModel.json | 3 + .../versioning/removed/v1/Configuration.json | 2 +- .../removed/v1/src/Generated/InterfaceV1.cs | 3 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../removed/v1/src/Generated/Models/EnumV1.cs | 2 +- .../removed/v1/src/Generated/Models/EnumV2.cs | 2 +- .../removed/v1/src/Generated/Models/EnumV3.cs | 2 +- .../Generated/Models/ModelV1.Serialization.cs | 2 +- .../v1/src/Generated/Models/ModelV1.cs | 2 +- .../Generated/Models/ModelV2.Serialization.cs | 2 +- .../v1/src/Generated/Models/ModelV2.cs | 2 +- .../Generated/Models/ModelV3.Serialization.cs | 2 +- .../v1/src/Generated/Models/ModelV3.cs | 2 +- .../removed/v1/src/Generated/RemovedClient.cs | 3 +- .../v1/src/Generated/RemovedClientOptions.cs | 2 +- .../VersioningRemovedV1ModelFactory.cs | 2 +- .../versioning/removed/v1/tspCodeModel.json | 11 + .../versioning/removed/v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../removed/v2/src/Generated/Models/EnumV2.cs | 2 +- .../removed/v2/src/Generated/Models/EnumV3.cs | 2 +- .../Generated/Models/ModelV2.Serialization.cs | 2 +- .../v2/src/Generated/Models/ModelV2.cs | 2 +- .../Generated/Models/ModelV3.Serialization.cs | 2 +- .../v2/src/Generated/Models/ModelV3.cs | 2 +- .../removed/v2/src/Generated/RemovedClient.cs | 3 +- .../v2/src/Generated/RemovedClientOptions.cs | 2 +- .../VersioningRemovedV2ModelFactory.cs | 2 +- .../versioning/removed/v2/tspCodeModel.json | 7 + .../removed/v2Preview/Configuration.json | 2 +- .../v2Preview/src/Generated/InterfaceV1.cs | 3 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../v2Preview/src/Generated/Models/EnumV1.cs | 2 +- .../v2Preview/src/Generated/Models/EnumV2.cs | 2 +- .../Generated/Models/ModelV1.Serialization.cs | 2 +- .../v2Preview/src/Generated/Models/ModelV1.cs | 2 +- .../Generated/Models/ModelV2.Serialization.cs | 2 +- .../v2Preview/src/Generated/Models/ModelV2.cs | 2 +- .../Generated/Models/ModelV3.Serialization.cs | 2 +- .../v2Preview/src/Generated/Models/ModelV3.cs | 2 +- .../v2Preview/src/Generated/RemovedClient.cs | 3 +- .../src/Generated/RemovedClientOptions.cs | 2 +- .../VersioningRemovedV2PreviewModelFactory.cs | 2 +- .../removed/v2Preview/tspCodeModel.json | 10 + .../renamedFrom/v1/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../v1/src/Generated/Models/OldEnum.cs | 2 +- .../Models/OldModel.Serialization.cs | 2 +- .../v1/src/Generated/Models/OldModel.cs | 2 +- .../v1/src/Generated/OldInterface.cs | 3 +- .../v1/src/Generated/RenamedFromClient.cs | 3 +- .../src/Generated/RenamedFromClientOptions.cs | 2 +- .../VersioningRenamedFromV1ModelFactory.cs | 2 +- .../renamedFrom/v1/tspCodeModel.json | 6 + .../renamedFrom/v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../v2/src/Generated/Models/NewEnum.cs | 2 +- .../Models/NewModel.Serialization.cs | 2 +- .../v2/src/Generated/Models/NewModel.cs | 2 +- .../v2/src/Generated/NewInterface.cs | 3 +- .../v2/src/Generated/RenamedFromClient.cs | 3 +- .../src/Generated/RenamedFromClientOptions.cs | 2 +- .../VersioningRenamedFromV2ModelFactory.cs | 2 +- .../renamedFrom/v2/tspCodeModel.json | 6 + .../v1/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/ReturnTypeChangedFromClient.cs | 2 +- .../ReturnTypeChangedFromClientOptions.cs | 2 +- .../v1/tspCodeModel.json | 2 + .../v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Generated/ReturnTypeChangedFromClient.cs | 2 +- .../ReturnTypeChangedFromClientOptions.cs | 2 +- .../v2/tspCodeModel.json | 2 + .../typeChangedFrom/v1/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/TestModel.Serialization.cs | 2 +- .../v1/src/Generated/Models/TestModel.cs | 2 +- .../v1/src/Generated/TypeChangedFromClient.cs | 3 +- .../Generated/TypeChangedFromClientOptions.cs | 2 +- ...VersioningTypeChangedFromV1ModelFactory.cs | 2 +- .../typeChangedFrom/v1/tspCodeModel.json | 3 + .../typeChangedFrom/v2/Configuration.json | 2 +- .../Internal/CodeGenMemberAttribute.cs | 16 ++ .../Internal/CodeGenSerializationAttribute.cs | 42 ++++ .../Internal/CodeGenSuppressAttribute.cs | 24 ++ .../Internal/CodeGenTypeAttribute.cs | 20 ++ .../Models/TestModel.Serialization.cs | 2 +- .../v2/src/Generated/Models/TestModel.cs | 2 +- .../v2/src/Generated/TypeChangedFromClient.cs | 3 +- .../Generated/TypeChangedFromClientOptions.cs | 2 +- ...VersioningTypeChangedFromV2ModelFactory.cs | 2 +- .../typeChangedFrom/v2/tspCodeModel.json | 3 + .../Local.Tests/ExtensibleEnumTests.cs | 2 +- .../FloatExtensibleEnum.Serialization.cs | 2 +- .../Generated/Models/FloatExtensibleEnum.cs | 2 +- ...xtensibleEnumWithIntValue.Serialization.cs | 2 +- .../Models/FloatExtensibleEnumWithIntValue.cs | 2 +- .../Models/FloatFixedEnum.Serialization.cs | 2 +- .../src/Generated/Models/FloatFixedEnum.cs | 2 +- ...loatFixedEnumWithIntValue.Serialization.cs | 2 +- .../Models/FloatFixedEnumWithIntValue.cs | 2 +- .../Models/IntExtensibleEnum.Serialization.cs | 2 +- .../src/Generated/Models/IntExtensibleEnum.cs | 2 +- .../Models/IntFixedEnum.Serialization.cs | 2 +- .../src/Generated/Models/IntFixedEnum.cs | 2 +- ...equiredNullableProperties.Serialization.cs | 3 +- .../ModelWithRequiredNullableProperties.cs | 2 +- ...rnsAnonymousModelResponse.Serialization.cs | 3 +- .../Models/ReturnsAnonymousModelResponse.cs | 2 +- .../Models/RoundTripModel.Serialization.cs | 3 +- .../src/Generated/Models/RoundTripModel.cs | 3 +- .../Generated/Models/StringExtensibleEnum.cs | 3 +- .../Models/StringFixedEnum.Serialization.cs | 2 +- .../src/Generated/Models/StringFixedEnum.cs | 2 +- .../Generated/Models/Thing.Serialization.cs | 3 +- .../src/Generated/Models/Thing.cs | 3 +- ...ThingOptionalLiteralFloat.Serialization.cs | 2 +- .../Models/ThingOptionalLiteralFloat.cs | 2 +- .../ThingOptionalLiteralInt.Serialization.cs | 2 +- .../Models/ThingOptionalLiteralInt.cs | 2 +- .../Models/ThingOptionalLiteralString.cs | 3 +- ...ThingRequiredLiteralFloat.Serialization.cs | 2 +- .../Models/ThingRequiredLiteralFloat.cs | 2 +- .../ThingRequiredLiteralInt.Serialization.cs | 2 +- .../Models/ThingRequiredLiteralInt.cs | 2 +- .../Models/ThingRequiredLiteralString.cs | 3 +- .../src/Generated/UnbrandedTypeSpecClient.cs | 1 - .../UnbrandedTypeSpecModelFactory.cs | 15 +- .../Unbranded-TypeSpec/tspCodeModel.json | 38 ++- packages/http-client-csharp/package-lock.json | 8 +- packages/http-client-csharp/package.json | 2 +- 1336 files changed, 9273 insertions(+), 2753 deletions(-) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenTypeAttribute.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientNamingModelFactory.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.Serialization.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientExtensibleEnum.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.Serialization.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.Serialization.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.Serialization.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ExtensibleEnum.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.Serialization.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClient.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClientOptions.cs delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/UnionEnum.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/{ModelsOps.cs => Models.cs} (99%) rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/{_Type._Array.sln => Type.Array.sln} (95%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/{_Type._Array.csproj => Type.Array.csproj} (65%) rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/{client/naming/Client.Naming.sln => type/dictionary/Type.Dictionary.sln} (95%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/{client/naming/src/Client.Naming.csproj => type/dictionary/src/Type.Dictionary.csproj} (64%) rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/{fixed/_Type._Enum.Fixed.sln => extensible/Type.Enum.Extensible.sln} (95%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/{fixed/src/_Type._Enum.Fixed.csproj => extensible/src/Type.Enum.Extensible.csproj} (63%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Type.Enum.Fixed.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Type.Enum.Fixed.csproj rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{dictionary/_Type.Dictionary.sln => model/empty/Type.Model.Empty.sln} (95%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{dictionary/src/_Type.Dictionary.csproj => model/empty/src/Type.Model.Empty.csproj} (74%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/_Type.Model.Inheritance.EnumDiscriminator.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/{not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj => enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj} (62%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/_Type.Model.Inheritance.EnumDiscriminator.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Type.Model.Usage.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Type.Model.Usage.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Type.Model.Visibility.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Type.Model.Visibility.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/_Type.Property.AdditionalProperties.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/_Type.Property.AdditionalProperties.csproj rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{model/visibility/_Type.Model.Visibility.sln => property/nullable/Type.Property.Nullable.sln} (95%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{model/visibility/src/_Type.Model.Visibility.csproj => property/nullable/src/Type.Property.Nullable.csproj} (74%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{enum/extensible/_Type._Enum.Extensible.sln => property/optionality/Type.Property.Optional.sln} (95%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/_Type.Property.Optional.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{enum/extensible/src/_Type._Enum.Extensible.csproj => property/optionality/src/Type.Property.Optional.csproj} (74%) delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/_Type.Property.Optional.csproj create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/Type.Property.ValueTypes.sln delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/_Type.Property.ValueTypes.sln create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Type.Property.ValueTypes.csproj delete mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/_Type.Property.ValueTypes.csproj rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{union/_Type.Union.sln => scalar/Type.Scalar.sln} (95%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{union/src/_Type.Union.csproj => scalar/src/Type.Scalar.csproj} (75%) rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{scalar/_Type.Scalar.sln => union/Type.Union.sln} (95%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenTypeAttribute.cs rename packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/{scalar/src/_Type.Scalar.csproj => union/src/Type.Union.csproj} (65%) create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs create mode 100644 packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs diff --git a/packages/http-client-csharp/emitter/src/emitter.ts b/packages/http-client-csharp/emitter/src/emitter.ts index 347ff2e154b..5331316bbb1 100644 --- a/packages/http-client-csharp/emitter/src/emitter.ts +++ b/packages/http-client-csharp/emitter/src/emitter.ts @@ -78,7 +78,6 @@ export async function $onEmit(context: EmitContext) { logDiagnostics(context.program.diagnostics, context.program.host.logSink); process.exit(1); } - const tspNamespace = root.Name; // this is the top-level namespace defined in the typespec file, which is actually always different from the namespace of the SDK if (root) { const generatedFolder = resolvePath(outputFolder, "src", "Generated"); @@ -93,13 +92,12 @@ export async function $onEmit(context: EmitContext) { ); //emit configuration.json - const namespace = options.namespace ?? tspNamespace; + const namespace = options.namespace ?? root.Name; const configurations: Configuration = { "output-folder": ".", namespace: namespace, "library-name": options["library-name"] ?? namespace, "unreferenced-types-handling": options["unreferenced-types-handling"], - "model-namespace": options["model-namespace"], "disable-xml-docs": options["disable-xml-docs"] === false ? undefined : options["disable-xml-docs"], }; 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 dcab3a379f2..85736e067b7 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 @@ -12,7 +12,7 @@ import { UsageFlags, } from "@azure-tools/typespec-client-generator-core"; import { NoTarget } from "@typespec/compiler"; -import { NetEmitterOptions, resolveOptions } from "../options.js"; +import { NetEmitterOptions } from "../options.js"; import { CodeModel } from "../type/code-model.js"; import { InputClient } from "../type/input-client.js"; import { InputOperationParameterKind } from "../type/input-operation-parameter-kind.js"; @@ -21,7 +21,6 @@ import { InputEnumType, InputModelType, InputType } from "../type/input-type.js" import { RequestLocation } from "../type/request-location.js"; import { SdkTypeMap } from "../type/sdk-type-map.js"; import { reportDiagnostic } from "./lib.js"; -import { Logger } from "./logger.js"; import { navigateModels } from "./model.js"; import { fromSdkServiceMethod, getParameterDefaultValue } from "./operation-converter.js"; import { processServiceAuthentication } from "./service-authentication.js"; @@ -51,8 +50,9 @@ export function createModel(sdkContext: SdkContext): CodeMode ? sdkApiVersionEnums[0].values.map((v) => v.value as string).flat() : rootClients[0].apiVersions; + // this is a set tracking the bad namespace segments const inputClients: InputClient[] = []; - fromSdkClients(rootClients, inputClients, []); + fromSdkClients(sdkContext, rootClients, inputClients, []); const clientModel: CodeModel = { Name: sdkPackage.rootNamespace, @@ -62,33 +62,55 @@ export function createModel(sdkContext: SdkContext): CodeMode Clients: inputClients, Auth: processServiceAuthentication(sdkContext, sdkPackage), }; + return clientModel; function fromSdkClients( + sdkContext: SdkContext, clients: SdkClientType[], inputClients: InputClient[], parentClientNames: string[], ) { for (const client of clients) { - const inputClient = emitClient(client, parentClientNames); + const inputClient = fromSdkClient(sdkContext, client, parentClientNames); inputClients.push(inputClient); const subClients = client.methods .filter((m) => m.kind === "clientaccessor") .map((m) => m.response as SdkClientType); parentClientNames.push(inputClient.Name); - fromSdkClients(subClients, inputClients, parentClientNames); + fromSdkClients(sdkContext, subClients, inputClients, parentClientNames); parentClientNames.pop(); } } - function emitClient(client: SdkClientType, parentNames: string[]): InputClient { + function fromSdkClient( + sdkContext: SdkContext, + client: SdkClientType, + parentNames: string[], + ): InputClient { const endpointParameter = client.initialization.properties.find( (p) => p.kind === "endpoint", ) as SdkEndpointParameter; const uri = getMethodUri(endpointParameter); const clientParameters = fromSdkEndpointParameter(endpointParameter); + const clientName = getClientName(client, parentNames); + // see if this namespace is a sub-namespace of an existing bad namespace + const segments = client.clientNamespace.split("."); + const lastSegment = segments[segments.length - 1]; + if (lastSegment === clientName) { + // we report diagnostics when the last segment of the namespace is the same as the client name + // because in our design, a sub namespace will be generated as a sub client with exact the same name as the namespace + // in csharp, this will cause a conflict between the namespace and the class name + reportDiagnostic(sdkContext.program, { + code: "client-namespace-conflict", + format: { clientNamespace: client.clientNamespace, clientName }, + target: client.__raw.type ?? NoTarget, + }); + } + return { - Name: getClientName(client, parentNames), + Name: clientName, + ClientNamespace: client.clientNamespace, Summary: client.summary, Doc: client.doc, Operations: client.methods @@ -119,14 +141,6 @@ export function createModel(sdkContext: SdkContext): CodeMode if (parentClientNames.length >= 2) return `${parentClientNames.slice(parentClientNames.length - 1).join("")}${clientName}`; - if ( - clientName === "Models" && - resolveOptions(sdkContext.emitContext)["model-namespace"] !== false - ) { - Logger.getInstance().warn(`Invalid client name "${clientName}"`); - return "ModelsOps"; - } - return clientName; } diff --git a/packages/http-client-csharp/emitter/src/lib/lib.ts b/packages/http-client-csharp/emitter/src/lib/lib.ts index 1c9c4ed2429..691b3879878 100644 --- a/packages/http-client-csharp/emitter/src/lib/lib.ts +++ b/packages/http-client-csharp/emitter/src/lib/lib.ts @@ -19,12 +19,6 @@ const $lib = createTypeSpecLibrary({ default: paramMessage`No Route for service for service ${"service"}`, }, }, - "invalid-name": { - severity: "warning", - messages: { - default: paramMessage`Invalid interface or operation group name ${"name"} when configuration "model-namespace" is on`, - }, - }, "general-warning": { severity: "warning", messages: { @@ -58,6 +52,12 @@ const $lib = createTypeSpecLibrary({ default: paramMessage`${"message"}`, }, }, + "client-namespace-conflict": { + severity: "warning", + messages: { + default: paramMessage`namespace ${"clientNamespace"} conflicts with client ${"clientName"}, please use @clientName to specify a different name for the client.`, + }, + }, }, emitter: { options: NetEmitterOptionsSchema, diff --git a/packages/http-client-csharp/emitter/src/lib/type-converter.ts b/packages/http-client-csharp/emitter/src/lib/type-converter.ts index 52f1c8d9df4..c89f34c0472 100644 --- a/packages/http-client-csharp/emitter/src/lib/type-converter.ts +++ b/packages/http-client-csharp/emitter/src/lib/type-converter.ts @@ -55,6 +55,7 @@ export function fromSdkType( retVar = { kind: "nullable", type: inputType, + clientNamespace: sdkType.clientNamespace, }; break; case "model": @@ -115,6 +116,7 @@ export function fromSdkModelType( inputModelType = { kind: "model", name: modelTypeName, + clientNamespace: modelType.clientNamespace, crossLanguageDefinitionId: modelType.crossLanguageDefinitionId, access: getAccessOverride( context, @@ -142,6 +144,7 @@ export function fromSdkModelType( const ourProperty = fromSdkModelProperty(property, { ModelName: modelTypeName, Usage: modelType.usage, + ClientNamespace: modelType.clientNamespace, } as LiteralTypeContext); propertiesDict.set(property, ourProperty); } @@ -227,6 +230,7 @@ export function fromSdkEnumType( context, enumType.__raw as any, ) /* when tcgc provide a way to identify if the access is override or not, we can get the accessibility from the enumType.access,*/, + clientNamespace: enumType.clientNamespace, deprecation: enumType.deprecation, summary: enumType.summary, doc: enumType.doc, @@ -304,6 +308,7 @@ function fromUnionType( kind: "union", name: union.name, variantTypes: variantTypes, + clientNamespace: union.clientNamespace, decorators: union.decorators, }; } @@ -341,6 +346,7 @@ function fromSdkConstantType( values: values, crossLanguageDefinitionId: "", access: undefined, + clientNamespace: literalTypeContext.ClientNamespace, doc: `The ${enumName}`, // TODO -- what should we put here? isFixed: false, isFlags: false, diff --git a/packages/http-client-csharp/emitter/src/options.ts b/packages/http-client-csharp/emitter/src/options.ts index 480529e4c80..1070ecb4c27 100644 --- a/packages/http-client-csharp/emitter/src/options.ts +++ b/packages/http-client-csharp/emitter/src/options.ts @@ -19,7 +19,6 @@ export interface NetEmitterOptions extends SdkEmitterOptions { "new-project"?: boolean; "clear-output-folder"?: boolean; "save-inputs"?: boolean; - "model-namespace"?: boolean; debug?: boolean; logLevel?: LoggerLevel; "disable-xml-docs"?: boolean; @@ -53,7 +52,6 @@ export const NetEmitterOptionsSchema: JSONSchemaType = { "new-project": { type: "boolean", nullable: true }, "clear-output-folder": { type: "boolean", nullable: true }, "save-inputs": { type: "boolean", nullable: true }, - "model-namespace": { type: "boolean", nullable: true }, "generate-protocol-methods": { type: "boolean", nullable: true }, "generate-convenience-methods": { type: "boolean", nullable: true }, "flatten-union-as-enum": { type: "boolean", nullable: true }, diff --git a/packages/http-client-csharp/emitter/src/type/configuration.ts b/packages/http-client-csharp/emitter/src/type/configuration.ts index a39b659e16d..7884584dff8 100644 --- a/packages/http-client-csharp/emitter/src/type/configuration.ts +++ b/packages/http-client-csharp/emitter/src/type/configuration.ts @@ -6,6 +6,5 @@ export interface Configuration { namespace: string; "library-name": string | null; "unreferenced-types-handling"?: "removeOrInternalize" | "internalize" | "keepAll"; - "model-namespace"?: boolean; "disable-xml-docs"?: boolean; } diff --git a/packages/http-client-csharp/emitter/src/type/input-client.ts b/packages/http-client-csharp/emitter/src/type/input-client.ts index bd9a62c8e7d..4eeee6dd08d 100644 --- a/packages/http-client-csharp/emitter/src/type/input-client.ts +++ b/packages/http-client-csharp/emitter/src/type/input-client.ts @@ -8,6 +8,7 @@ import { Protocols } from "./protocols.js"; export interface InputClient { Name: string; + ClientNamespace: string; Summary?: string; Doc?: string; Operations: InputOperation[]; diff --git a/packages/http-client-csharp/emitter/src/type/input-type.ts b/packages/http-client-csharp/emitter/src/type/input-type.ts index 5653a7c0659..1f066a104de 100644 --- a/packages/http-client-csharp/emitter/src/type/input-type.ts +++ b/packages/http-client-csharp/emitter/src/type/input-type.ts @@ -79,6 +79,7 @@ export interface InputUnionType extends InputTypeBase { kind: "union"; name: string; variantTypes: InputType[]; + clientNamespace: string; } export function isInputUnionType(type: InputType): type is InputUnionType { @@ -92,6 +93,7 @@ export interface InputModelType extends InputTypeBase { crossLanguageDefinitionId: string; access?: AccessFlags; usage: UsageFlags; + clientNamespace: string; additionalProperties?: InputType; discriminatorValue?: string; discriminatedSubtypes?: Record; @@ -127,6 +129,7 @@ export interface InputEnumType extends InputTypeBase { isFlags: boolean; usage: UsageFlags; access?: AccessFlags; + clientNamespace: string; } export interface InputEnumTypeValue extends InputTypeBase { @@ -140,6 +143,7 @@ export interface InputEnumTypeValue extends InputTypeBase { export interface InputNullableType extends InputTypeBase { kind: "nullable"; type: InputType; + clientNamespace: string; } export function isInputEnumType(type: InputType): type is InputEnumType { diff --git a/packages/http-client-csharp/emitter/src/type/literal-type-context.ts b/packages/http-client-csharp/emitter/src/type/literal-type-context.ts index 0d46f86e992..7c8b8642ee8 100644 --- a/packages/http-client-csharp/emitter/src/type/literal-type-context.ts +++ b/packages/http-client-csharp/emitter/src/type/literal-type-context.ts @@ -7,4 +7,5 @@ export interface LiteralTypeContext { ModelName: string; PropertyName: string; Usage: UsageFlags; + ClientNamespace: string; } diff --git a/packages/http-client-csharp/eng/scripts/Generate.ps1 b/packages/http-client-csharp/eng/scripts/Generate.ps1 index b82826da6c4..48d2a690e9d 100644 --- a/packages/http-client-csharp/eng/scripts/Generate.ps1 +++ b/packages/http-client-csharp/eng/scripts/Generate.ps1 @@ -54,10 +54,10 @@ $failingSpecs = @( Join-Path 'http' 'payload' 'xml' Join-Path 'http' 'type' 'model' 'flatten' Join-Path 'http' 'type' 'model' 'templated' + Join-Path 'http' 'client' 'naming' # pending until https://github.com/microsoft/typespec/issues/5653 is resolved ) $azureAllowSpecs = @( - Join-Path 'http' 'client' 'naming' Join-Path 'http' 'client' 'structure' 'client-operation-group' Join-Path 'http' 'client' 'structure' 'default' Join-Path 'http' 'client' 'structure' 'multi-client' @@ -110,6 +110,7 @@ foreach ($directory in $directories) { } if ($folders.Contains("versioning")) { + Write-Host "Generating versioning for $subPath" -ForegroundColor Cyan Generate-Versioning $directory.FullName $generationDir -generateStub $stubbed $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1") $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2") diff --git a/packages/http-client-csharp/eng/scripts/Generation.psm1 b/packages/http-client-csharp/eng/scripts/Generation.psm1 index cd10f88dc3e..526a4bafbcc 100644 --- a/packages/http-client-csharp/eng/scripts/Generation.psm1 +++ b/packages/http-client-csharp/eng/scripts/Generation.psm1 @@ -25,7 +25,7 @@ function Get-TspCommand { [string]$specFile, [string]$generationDir, [bool]$generateStub = $false, - [string]$namespaceOverride = $null, + [string]$libraryNameOverride = $null, [string]$apiVersion = $null ) $command = "npx tsp compile $specFile" @@ -41,8 +41,8 @@ function Get-TspCommand { $command += " --option @typespec/http-client-csharp.plugin-name=StubLibraryPlugin" } - if ($namespaceOverride) { - $command += " --option @typespec/http-client-csharp.namespace=$namespaceOverride" + if ($libraryNameOverride) { + $command += " --option @typespec/http-client-csharp.library-name=$libraryNameOverride" } if ($apiVersion) { @@ -104,14 +104,14 @@ function Generate-Srv-Driven { ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces $namespaceRoot = $(($outputDir.Split([System.IO.Path]::DirectorySeparatorChar)[-2..-1] | ` ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -replace '-(\p{L})', { $_.Groups[1].Value.ToUpper() } -replace '\W', '' -join ".") - $v1NamespaceOverride = $namespaceRoot + ".V1" - $v2NamespaceOverride = $namespaceRoot + ".V2" + $v1LibraryNameOverride = $namespaceRoot + ".V1" + $v2LibraryNameOverride = $namespaceRoot + ".V2" $v1SpecFilePath = $(Join-Path $specFilePath "old.tsp") $v2SpecFilePath = $(Join-Path $specFilePath "main.tsp") - Invoke (Get-TspCommand $v1SpecFilePath $v1Dir -generateStub $generateStub -namespaceOverride $v1NamespaceOverride) - Invoke (Get-TspCommand $v2SpecFilePath $v2Dir -generateStub $generateStub -namespaceOverride $v2NamespaceOverride) + Invoke (Get-TspCommand $v1SpecFilePath $v1Dir -generateStub $generateStub -libraryNameOverride $v1LibraryNameOverride) + Invoke (Get-TspCommand $v2SpecFilePath $v2Dir -generateStub $generateStub -libraryNameOverride $v2LibraryNameOverride) # exit if the generation failed if ($LASTEXITCODE -ne 0) { @@ -140,19 +140,19 @@ function Generate-Versioning { ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces $namespaceRoot = $(($outputFolders[-2..-1] | ` ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -join ".") - $v1NamespaceOverride = $namespaceRoot + ".V1" - $v2NamespaceOverride = $namespaceRoot + ".V2" - - Invoke (Get-TspCommand $specFilePath $v1Dir -generateStub $generateStub -apiVersion "v1" -namespaceOverride $v1NamespaceOverride) - Invoke (Get-TspCommand $specFilePath $v2Dir -generateStub $generateStub -apiVersion "v2" -namespaceOverride $v2NamespaceOverride) + $v1LibraryNameOverride = $namespaceRoot + ".V1" + $v2LibraryNameOverride = $namespaceRoot + ".V2" + + Invoke (Get-TspCommand $specFilePath $v1Dir -generateStub $generateStub -apiVersion "v1" -libraryNameOverride $v1LibraryNameOverride) + Invoke (Get-TspCommand $specFilePath $v2Dir -generateStub $generateStub -apiVersion "v2" -libraryNameOverride $v2LibraryNameOverride) if ($outputFolders.Contains("removed")) { $v2PreviewDir = $(Join-Path $outputDir "v2Preview") if ($createOutputDirIfNotExist -and -not (Test-Path $v2PreviewDir)) { New-Item -ItemType Directory -Path $v2PreviewDir | Out-Null } - $v2PreviewNamespaceOverride = $namespaceRoot + ".V2Preview" - Invoke (Get-TspCommand $specFilePath $v2PreviewDir -generateStub $generateStub -apiVersion "v2preview" -namespaceOverride $v2PreviewNamespaceOverride) + $v2PreviewLibraryNameOverride = $namespaceRoot + ".V2Preview" + Invoke (Get-TspCommand $specFilePath $v2PreviewDir -generateStub $generateStub -apiVersion "v2preview" -libraryNameOverride $v2PreviewLibraryNameOverride) } # exit if the generation failed diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientProvider.cs index 6d7869ec17e..b1fee714bcd 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientProvider.cs @@ -143,6 +143,10 @@ public ClientProvider(InputClient inputClient) _subClients = new(GetSubClients); } + protected override string BuildNamespace() => string.IsNullOrEmpty(_inputClient.Namespace) ? + base.BuildNamespace() : + ClientModelPlugin.Instance.TypeFactory.GetCleanNameSpace(_inputClient.Namespace); + private IReadOnlyList GetSubClientInternalConstructorParameters() { var subClientParameters = new List @@ -311,7 +315,7 @@ protected override ConstructorProvider[] BuildConstructors() AppendConstructors(_apiKeyAuthFields, primaryConstructors, secondaryConstructors); } // if there is oauth2 auth - if (_oauth2Fields!= null) + if (_oauth2Fields != null) { AppendConstructors(_oauth2Fields, primaryConstructors, secondaryConstructors); } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/RestClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/RestClientProvider.cs index 04d92678366..e8236581847 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/RestClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/RestClientProvider.cs @@ -46,6 +46,8 @@ public RestClientProvider(InputClient inputClient, ClientProvider clientProvider protected override string BuildName() => _inputClient.Name.ToCleanName(); + protected override string BuildNamespace() => ClientProvider.Namespace; + protected override PropertyProvider[] BuildProperties() { return [.. _pipelineMessage20xClassifiers.Values.OrderBy(v => v.Name)]; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ScmMethodProviderCollection.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ScmMethodProviderCollection.cs index 451d7eb4fc3..0f1364803a0 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ScmMethodProviderCollection.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ScmMethodProviderCollection.cs @@ -23,6 +23,7 @@ public class ScmMethodProviderCollection : MethodProviderCollection { private string _cleanOperationName; private readonly MethodProvider _createRequestMethod; + private static readonly ClientPipelineExtensionsDefinition _clientPipelineExtensionsDefinition = new(); private ClientProvider Client { get; } @@ -432,7 +433,7 @@ private ScmMethodProvider BuildProtocolMethod(MethodProvider createRequestMethod MethodBodyStatement[] methodBody = [ UsingDeclare("message", ClientModelPlugin.Instance.TypeFactory.HttpMessageApi.HttpMessageType, This.Invoke(createRequestMethod.Signature, [.. requiredParameters, ..optionalParameters, requestOptionsParameter]), out var message), - Return(ClientModelPlugin.Instance.TypeFactory.ClientResponseApi.ToExpression().FromResponse(client.PipelineProperty.Invoke(processMessageName, [message, requestOptionsParameter], isAsync, true))), + Return(ClientModelPlugin.Instance.TypeFactory.ClientResponseApi.ToExpression().FromResponse(client.PipelineProperty.Invoke(processMessageName, [message, requestOptionsParameter], isAsync, true, extensionType: _clientPipelineExtensionsDefinition.Type))), ]; var protocolMethod = diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/InputLibraryVisitorTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/InputLibraryVisitorTests.cs index 5209d6f1775..fe3d1014ed6 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/InputLibraryVisitorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/InputLibraryVisitorTests.cs @@ -40,7 +40,7 @@ public void PreVisitsMethods() var inputOperation = InputFactory.Operation("testOperation", parameters: [param], responses: [InputFactory.OperationResponse(bodytype: InputPrimitiveType.Any)]); var inputClient = InputFactory.Client("fooClient", operations: [inputOperation], parameters: [param]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace( - "test library", + "Sample", models: [inputModel], clients: [inputClient])); @@ -57,7 +57,7 @@ public void PreVisitsClients() var inputClient = InputFactory.Client("fooClient"); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace( - "test library", + "Sample", clients: [inputClient])); var mockOutputLibrary = new Mock { CallBase = true }; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/FriendTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/FriendTests.cs index 8f1af01cb7d..ac97ed1425a 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/FriendTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/FriendTests.cs @@ -3,9 +3,8 @@ using System.ClientModel; using System.IO; -using NUnit.Framework; -using UnbrandedTypeSpec.Models; using Microsoft.Generator.CSharp.Tests.Common; +using NUnit.Framework; using UnbrandedTypeSpec.Models.Custom; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ModelWithRequiredNullablePropertiesTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ModelWithRequiredNullablePropertiesTests.cs index 2e112f23bad..23a685c94a0 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ModelWithRequiredNullablePropertiesTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ModelWithRequiredNullablePropertiesTests.cs @@ -6,7 +6,7 @@ using System.Text.Json; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; -using UnbrandedTypeSpec.Models; +using UnbrandedTypeSpec; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ProjectedModelTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ProjectedModelTests.cs index 4ad2764fb1e..bc832e8d09a 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ProjectedModelTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ProjectedModelTests.cs @@ -5,7 +5,6 @@ using System.IO; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; -using UnbrandedTypeSpec.Models; using UnbrandedTypeSpec.Models.Custom; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ReturnsAnonymousModelResponseTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ReturnsAnonymousModelResponseTests.cs index edb7a322a5b..6565e9a9f43 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ReturnsAnonymousModelResponseTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ReturnsAnonymousModelResponseTests.cs @@ -5,7 +5,7 @@ using System.IO; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; -using UnbrandedTypeSpec.Models; +using UnbrandedTypeSpec; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/RoundTripModelTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/RoundTripModelTests.cs index 8be7f6b3bdd..4c06d310286 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/RoundTripModelTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/RoundTripModelTests.cs @@ -6,7 +6,7 @@ using System.Text.Json; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; -using UnbrandedTypeSpec.Models; +using UnbrandedTypeSpec; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ThingTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ThingTests.cs index a6cacac406b..36298ca6890 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ThingTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ThingTests.cs @@ -6,7 +6,7 @@ using System.Text.Json; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; -using UnbrandedTypeSpec.Models; +using UnbrandedTypeSpec; namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientResponseApiTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientResponseApiTests.cs index bb854aeed03..2cbf53b1c88 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientResponseApiTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientResponseApiTests.cs @@ -39,7 +39,7 @@ public void ValidateBodyOfClientOperationIsOverridden() private static ClientProvider CreateMockClientProvider() { - var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]); + var client = InputFactory.Client("TestClient", operations: [InputFactory.Operation("foo")]); MockHelpers.LoadMockPlugin(clientResponseApi: TestClientResponseApi.Instance); var clientProvider = ClientModelPlugin.Instance.TypeFactory.CreateClient(client); Assert.IsNotNull(clientProvider); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/HttpMessageApiTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/HttpMessageApiTests.cs index cf7a9ad711e..a5422d39061 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/HttpMessageApiTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/HttpMessageApiTests.cs @@ -36,7 +36,7 @@ public void ValidateBodyOfProcessMessageIsOverridden() private static ClientProvider CreateTestClient() { - var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]); + var client = InputFactory.Client("TestClient", operations: [InputFactory.Operation("foo")]); MockHelpers.LoadMockPlugin(httpMessageApi: TestHttpMessageApi.Instance); var clientProvider = ClientModelPlugin.Instance.TypeFactory.CreateClient(client); Assert.IsNotNull(clientProvider); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs index c4200d86cd6..8a48d93d4fd 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs @@ -275,7 +275,7 @@ public async Task CanRenameSubClient() InputFactory.Parameter("p1", InputFactory.Array(InputPrimitiveType.String)) ]); var inputClient = InputFactory.Client("TestClient", operations: [inputOperation]); - InputClient subClient = InputFactory.Client("custom", [], [], inputClient.Name); + InputClient subClient = InputFactory.Client("custom", parent: inputClient.Name); var plugin = await MockHelpers.LoadMockPluginAsync( clients: () => [inputClient, subClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -302,7 +302,7 @@ public async Task CanRemoveCachingField() InputFactory.Parameter("p1", InputFactory.Array(InputPrimitiveType.String)) ]); var inputClient = InputFactory.Client("TestClient", operations: [inputOperation]); - InputClient subClient = InputFactory.Client("dog", [], [], inputClient.Name); + InputClient subClient = InputFactory.Client("dog", operations: [], parameters: [], parent: inputClient.Name); var plugin = await MockHelpers.LoadMockPluginAsync( clients: () => [inputClient, subClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs index bd9f33aba34..30fe929de07 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs @@ -14,11 +14,11 @@ namespace Microsoft.Generator.CSharp.ClientModel.Tests.Providers.ClientProviders public class ClientProviderSubClientTests { private const string TestClientName = "TestClient"; - private static readonly InputClient _animalClient = new("animal", string.Empty, "AnimalClient description", [], [], TestClientName); - private static readonly InputClient _dogClient = new("dog", string.Empty, "DogClient description", [], [], _animalClient.Name); - private static readonly InputClient _catClient = new("cat", string.Empty, "CatClient description", [], [], _animalClient.Name); - private static readonly InputClient _hawkClient = new("hawkClient", string.Empty, "HawkClient description", [], [], _animalClient.Name); - private static readonly InputClient _huskyClient = new("husky", string.Empty, "HuskyClient description", [], [], _dogClient.Name); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: TestClientName); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient.Name); + private static readonly InputClient _catClient = InputFactory.Client("cat", doc: "CatClient description", parent: _animalClient.Name); + private static readonly InputClient _hawkClient = InputFactory.Client("hawkClient", doc: "HawkClient description", parent: _animalClient.Name); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient.Name); [SetUp] public void SetUp() diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs index 26579b98973..c4299f9626e 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs @@ -26,9 +26,9 @@ public class ClientProviderTests private const string KeyAuthCategory = "WithKeyAuth"; private const string OAuth2Category = "WithOAuth2"; private const string TestClientName = "TestClient"; - private static readonly InputClient _animalClient = new("animal", "", "AnimalClient description", [], [], TestClientName); - private static readonly InputClient _dogClient = new("dog", "", "DogClient description", [], [], _animalClient.Name); - private static readonly InputClient _huskyClient = new("husky", "", "HuskyClient description", [], [], _dogClient.Name); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: TestClientName); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient.Name); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient.Name); private static readonly InputModelType _spreadModel = InputFactory.Model( "spreadModel", usage: InputModelTypeUsage.Spread, @@ -736,7 +736,7 @@ public void TestApiVersionPathParameterOfClient(InputClient inputClient) public void ClientProviderIsAddedToLibrary() { var plugin = MockHelpers.LoadMockPlugin( - clients: () => [new InputClient("test", "test", "test", [], [], null)]); + clients: () => [InputFactory.Client("test", clientNamespace: "test", doc: "test")]); Assert.AreEqual(1, plugin.Object.OutputLibrary.TypeProviders.OfType().Count()); } @@ -745,7 +745,7 @@ public void ClientProviderIsAddedToLibrary() public void NullClientProviderIsNotAddedToLibrary() { var plugin = MockHelpers.LoadMockPlugin( - clients: () => [new InputClient("test", "test", "test", [], [], null)], + clients: () => [InputFactory.Client("test", clientNamespace: "test", doc: "test")], createClientCore: (client) => null); Assert.IsEmpty(plugin.Object.OutputLibrary.TypeProviders.OfType()); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/AdditionalPropertiesTest.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/AdditionalPropertiesTest.cs index 7819a4384be..bf9fd14ed70 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/AdditionalPropertiesTest.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/AdditionalPropertiesTest.cs @@ -19,8 +19,7 @@ public void TestBuildDeserializationMethod( string[] expectedValueTypeNames, string[] expectedValueKindChecks) { - var inputModel = InputFactory.Model("cat", - properties: + var inputModel = InputFactory.Model("cat", properties: [ InputFactory.Property("color", InputPrimitiveType.String, isRequired: true), ], @@ -74,8 +73,7 @@ public void TestBuildDeserializationMethod( public void TestBuildJsonModelWriteCore( InputType additionalPropsValueType) { - var inputModel = InputFactory.Model("cat", - properties: + var inputModel = InputFactory.Model("cat", properties: [ InputFactory.Property("color", InputPrimitiveType.String, isRequired: true), ], diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/JsonModelCoreTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/JsonModelCoreTests.cs index c173d163050..50aedced47b 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/JsonModelCoreTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/JsonModelCoreTests.cs @@ -86,8 +86,7 @@ public void CamelCaseSerializedName() [Test] public void MultipleAdditionalProperties() { - var inputModel = InputFactory.Model("TestModel", properties: [InputFactory.Property("color", InputPrimitiveType.String, isRequired: true)], - additionalProperties: new InputUnionType("union", [InputPrimitiveType.String, InputPrimitiveType.Float64])); + var inputModel = InputFactory.Model("TestModel", properties: [InputFactory.Property("color", InputPrimitiveType.String, isRequired: true)], additionalProperties: new InputUnionType("union", [InputPrimitiveType.String, InputPrimitiveType.Float64])); var mrwProvider = new ModelProvider(inputModel).SerializationProviders.First(); var writer = new TypeProviderWriter(mrwProvider); @@ -98,8 +97,7 @@ public void MultipleAdditionalProperties() [Test] public void BinaryDataAdditionalProperties() { - var inputModel = InputFactory.Model("TestModel", properties: [InputFactory.Property("color", InputPrimitiveType.String, isRequired: true)], - additionalProperties: InputPrimitiveType.Any); + var inputModel = InputFactory.Model("TestModel", properties: [InputFactory.Property("color", InputPrimitiveType.String, isRequired: true)], additionalProperties: InputPrimitiveType.Any); var mrwProvider = new ModelProvider(inputModel).SerializationProviders.First(); var writer = new TypeProviderWriter(mrwProvider); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs index 8b41617ce1f..14ca011d50b 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs @@ -693,7 +693,7 @@ public void TestIntSerializationStatement( new InputModelProperty("requiredInt", "", "", new InputPrimitiveType(kind, name, $"TypeSpec.{name}", encode), true, false, false, new(json: new("requiredInt"))), }; - var inputModel = new InputModelType("TestModel", "TestModel", "public", null, "", "Test model.", InputModelTypeUsage.Input, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new()); + var inputModel = new InputModelType("TestModel", "TestNamespace", "TestModel", "public", null, "", "Test model.", InputModelTypeUsage.Input, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new()); var (_, serialization) = CreateModelAndSerialization(inputModel); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs index c4195bb07a5..b09a6c53a07 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/MrwSerializationTypeDefinitions/SerializationCustomizationTests.cs @@ -42,14 +42,11 @@ public async Task CanChangePropertyName() [Test] public async Task ReadOnlyMemPropertyType() { - var props = new[] - { - InputFactory.Property("Prop1", InputFactory.Array(InputPrimitiveType.String)), - InputFactory.Property("Prop2", InputFactory.Array(InputPrimitiveType.String)) - - }; - - var inputModel = InputFactory.Model("Model", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("Model", properties: [ + InputFactory.Property("Prop1", InputFactory.Array(InputPrimitiveType.String)), + InputFactory.Property("Prop2", InputFactory.Array(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -68,13 +65,11 @@ public async Task ReadOnlyMemPropertyType() [Test] public async Task CanCustomizeSerializationMethod() { - var props = new[] - { - InputFactory.Property("Prop1", InputPrimitiveType.String), - InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -92,13 +87,11 @@ public async Task CanCustomizeSerializationMethod() [Test] public async Task CanCustomizeSerializationMethodForRenamedProperty() { - var props = new[] - { - InputFactory.Property("Prop1", InputPrimitiveType.String), - InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -150,14 +143,12 @@ public async Task CanCustomizeSerializationMethodForPropertyInBase() [Test] public async Task CanChangePropertySerializedName() { - var props = new[] - { - InputFactory.Property("Name", InputPrimitiveType.String), - InputFactory.Property("Color", InputPrimitiveType.String), - InputFactory.Property("Flavor", InputPrimitiveType.String) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Name", InputPrimitiveType.String), + InputFactory.Property("Color", InputPrimitiveType.String), + InputFactory.Property("Flavor", InputPrimitiveType.String) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -192,13 +183,11 @@ public async Task CanChangePropertySerializedName() [Test] public async Task CanChangeDictionaryToBinaryData() { - var props = new[] - { - // generated type is a dictionary of string to BinaryData - InputFactory.Property("Prop1", InputFactory.Dictionary(InputPrimitiveType.Any)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + // generated type is a dictionary of string to BinaryData + InputFactory.Property("Prop1", InputFactory.Dictionary(InputPrimitiveType.Any)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -222,12 +211,10 @@ public async Task CanChangeDictionaryToBinaryData() [TestCaseSource(nameof(ExtensibleEnumCases))] public async Task CanCustomizeExtensibleEnum(InputPrimitiveType enumType) { - var props = new[] - { - InputFactory.Property("Prop1", InputFactory.Enum("EnumType", enumType, isExtensible: true)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputFactory.Enum("EnumType", enumType, isExtensible: true)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(enumType.Name)); @@ -251,14 +238,12 @@ public async Task CanCustomizeExtensibleEnum(InputPrimitiveType enumType) [TestCaseSource(nameof(ExtensibleEnumCasesFromLiteral))] public async Task CanCustomizeLiteralExtensibleEnum(InputPrimitiveType enumType, object value) { - var props = new[] - { - InputFactory.Property("Prop1", InputFactory.Literal.Enum( - InputFactory.Enum("EnumType", enumType, isExtensible: true), - value: value)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputFactory.Literal.Enum( + InputFactory.Enum("EnumType", enumType, isExtensible: true), + value: value)) + ], + usage: InputModelTypeUsage.Json); var parameters = $"{enumType.Name},{value}"; var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], @@ -277,13 +262,11 @@ public async Task CanCustomizeLiteralExtensibleEnum(InputPrimitiveType enumType, [Test] public async Task CanReplaceSerializationMethod() { - var props = new[] - { - InputFactory.Property("Prop1", InputPrimitiveType.String), - InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -306,13 +289,11 @@ public async Task CanReplaceSerializationMethod() [Test] public async Task CanReplaceDeserializationMethod() { - var props = new[] - { - InputFactory.Property("Prop1", InputPrimitiveType.String), - InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + InputFactory.Property("Prop2", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -336,12 +317,10 @@ public async Task CanReplaceDeserializationMethod() [TestCase(false)] public async Task CanCustomizePropertyUsingField(bool redefineProperty) { - var props = new[] - { - InputFactory.Property("Prop1", InputPrimitiveType.String), - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("Prop1", InputPrimitiveType.String), + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(redefineProperty.ToString())); @@ -363,12 +342,10 @@ public async Task CanCustomizePropertyUsingField(bool redefineProperty) [Test] public async Task CanChangeToNonNullableProp() { - var props = new[] - { - InputFactory.Property("Prop1", new InputNullableType(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("Model", properties: props, usage: InputModelTypeUsage.Json); + var inputModel = InputFactory.Model("Model", properties: [ + InputFactory.Property("Prop1", new InputNullableType(InputPrimitiveType.String)) + ], + usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -391,16 +368,13 @@ public async Task CanChangeToNonNullableProp() [Test] public async Task CanChangeListOfEnumPropToListOfExtensibleEnum() { - var props = new[] - { - InputFactory.Property("Prop1", InputFactory.Array(InputFactory.Enum( - "MyEnum", - InputPrimitiveType.String, - usage: InputModelTypeUsage.Input, - values: [InputFactory.EnumMember.String("foo", "bar")]))) - }; - - var inputModel = InputFactory.Model("Model", properties: props); + var inputModel = InputFactory.Model("Model", properties: [ + InputFactory.Property("Prop1", InputFactory.Array(InputFactory.Enum( + "MyEnum", + InputPrimitiveType.String, + usage: InputModelTypeUsage.Input, + values: [InputFactory.EnumMember.String("foo", "bar")]))) + ]); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => [inputModel], @@ -417,12 +391,9 @@ public async Task CanChangeListOfEnumPropToListOfExtensibleEnum() [Test] public async Task CanChangePropertyNameAndRedefineOriginal() { - var props = new[] - { - InputFactory.Property("prop1", InputFactory.Array(InputPrimitiveType.String)) - }; - - var inputModel = InputFactory.Model("mockInputModel", properties: props); + var inputModel = InputFactory.Model("mockInputModel", properties: [ + InputFactory.Property("prop1", InputFactory.Array(InputPrimitiveType.String)) + ]); var plugin = await MockHelpers.LoadMockPluginAsync( inputModels: () => new[] { inputModel }, diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/TestHelpers/MockHelpers.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/TestHelpers/MockHelpers.cs index 4283c54f170..b66d987c851 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/TestHelpers/MockHelpers.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/TestHelpers/MockHelpers.cs @@ -68,12 +68,13 @@ public static Mock LoadMockPlugin( InputAuth inputNsAuth = new InputAuth(apiKeyAuth?.Invoke(), oauth2Auth?.Invoke()); var mockTypeFactory = new Mock() { CallBase = true }; var mockInputNs = new Mock( - string.Empty, + "Sample", inputNsApiVersions, inputNsEnums, inputNsModels, inputNsClients, - inputNsAuth); + inputNsAuth, + Array.Empty()); var mockInputLibrary = new Mock(_configFilePath); mockInputLibrary.Setup(p => p.InputNamespace).Returns(mockInputNs.Object); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputClient.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputClient.cs index ea3690e487b..66ce6c2aa56 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputClient.cs @@ -11,9 +11,10 @@ public class InputClient private readonly string? _key; private IReadOnlyDictionary? _examples; - public InputClient(string name, string? summary, string? doc, IReadOnlyList operations, IReadOnlyList parameters, string? parent) + public InputClient(string name, string @namespace, string? summary, string? doc, IReadOnlyList operations, IReadOnlyList parameters, string? parent) { Name = name; + Namespace = @namespace; Summary = summary; Doc = doc; Operations = operations; @@ -21,9 +22,10 @@ public InputClient(string name, string? summary, string? doc, IReadOnlyList(), Array.Empty(), null) { } + public InputClient() : this(string.Empty, string.Empty, string.Empty, string.Empty, Array.Empty(), Array.Empty(), null) { } public string Name { get; internal set; } + public string Namespace { get; internal set; } public string? Summary { get; internal set; } public string? Doc { get; internal set; } public IReadOnlyList Operations { get; internal set; } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputEnumType.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputEnumType.cs index 968229d763c..ccd478ebdd5 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputEnumType.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputEnumType.cs @@ -7,9 +7,10 @@ namespace Microsoft.Generator.CSharp.Input { public class InputEnumType : InputType { - public InputEnumType(string name, string crossLanguageDefinitionId, string? accessibility, string? deprecated, string? summary, string? doc, InputModelTypeUsage usage, InputPrimitiveType valueType, IReadOnlyList values, bool isExtensible) + public InputEnumType(string name, string @namespace, string crossLanguageDefinitionId, string? accessibility, string? deprecated, string? summary, string? doc, InputModelTypeUsage usage, InputPrimitiveType valueType, IReadOnlyList values, bool isExtensible) : base(name) { + Namespace = @namespace; CrossLanguageDefinitionId = crossLanguageDefinitionId; Accessibility = accessibility; Deprecated = deprecated; @@ -21,6 +22,7 @@ public InputEnumType(string name, string crossLanguageDefinitionId, string? acce IsExtensible = isExtensible; } + public string Namespace { get; } public string CrossLanguageDefinitionId { get; } public string? Accessibility { get; } public string? Deprecated { get; } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputModelType.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputModelType.cs index db2303e587f..dc927672a33 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputModelType.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputModelType.cs @@ -15,9 +15,10 @@ public class InputModelType : InputType private IList _derivedModels = []; // TODO: Follow up issue https://github.com/microsoft/typespec/issues/3619. After https://github.com/Azure/typespec-azure/pull/966 is completed, update this type and remove the "modelAsStruct" parameter. - public InputModelType(string name, string crossLanguageDefinitionId, string? access, string? deprecation, string? summary, string? doc, InputModelTypeUsage usage, IReadOnlyList properties, InputModelType? baseModel, IReadOnlyList derivedModels, string? discriminatorValue, InputModelProperty? discriminatorProperty, IReadOnlyDictionary discriminatedSubtypes, InputType? additionalProperties, bool modelAsStruct, InputSerializationOptions serializationOptions) + public InputModelType(string name, string @namespace, string crossLanguageDefinitionId, string? access, string? deprecation, string? summary, string? doc, InputModelTypeUsage usage, IReadOnlyList properties, InputModelType? baseModel, IReadOnlyList derivedModels, string? discriminatorValue, InputModelProperty? discriminatorProperty, IReadOnlyDictionary discriminatedSubtypes, InputType? additionalProperties, bool modelAsStruct, InputSerializationOptions serializationOptions) : base(name) { + Namespace = @namespace; CrossLanguageDefinitionId = crossLanguageDefinitionId; Access = access; Deprecation = deprecation; @@ -47,6 +48,7 @@ public InputModelType(string name, string crossLanguageDefinitionId, string? acc SerializationOptions = serializationOptions; } + public string Namespace { get; internal set; } public string CrossLanguageDefinitionId { get; internal set; } public string? Access { get; internal set; } public string? Deprecation { get; internal set; } @@ -93,6 +95,7 @@ internal set _discriminatedSubtypes.Add(UnknownDiscriminatorValue, new InputModelType( $"Unknown{cleanBaseName}", + Namespace, $"Unknown{cleanBaseName}", "internal", null, diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputNamespace.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputNamespace.cs index f25e6d44c31..76776be5102 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputNamespace.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/InputNamespace.cs @@ -8,7 +8,14 @@ namespace Microsoft.Generator.CSharp.Input { public class InputNamespace { - public InputNamespace(string name, IReadOnlyList apiVersions, IReadOnlyList enums, IReadOnlyList models, IReadOnlyList clients, InputAuth auth) + private static readonly string[] _knownInvalidNamespaceSegments = + [ + "Type", + "Array", + "Enum", + ]; + + public InputNamespace(string name, IReadOnlyList apiVersions, IReadOnlyList enums, IReadOnlyList models, IReadOnlyList clients, InputAuth auth, IReadOnlyList? invalidNamespaceSegments = null) { Name = name; ApiVersions = apiVersions; @@ -16,6 +23,9 @@ public InputNamespace(string name, IReadOnlyList apiVersions, IReadOnlyL Models = models; Clients = clients; Auth = auth; + InvalidNamespaceSegments = invalidNamespaceSegments != null ? + [.._knownInvalidNamespaceSegments, ..invalidNamespaceSegments] : + _knownInvalidNamespaceSegments; } public InputNamespace() : this(name: string.Empty, apiVersions: Array.Empty(), enums: Array.Empty(), models: Array.Empty(), clients: Array.Empty(), auth: new InputAuth()) { } @@ -26,5 +36,6 @@ public InputNamespace(string name, IReadOnlyList apiVersions, IReadOnlyL public IReadOnlyList Models { get; init; } public IReadOnlyList Clients { get; init; } public InputAuth Auth { get; init; } + public IReadOnlyList InvalidNamespaceSegments { get; init; } } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputClientConverter.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputClientConverter.cs index 3bfd8f3bfcf..452e3a4957d 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputClientConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputClientConverter.cs @@ -35,6 +35,7 @@ public override void Write(Utf8JsonWriter writer, InputClient value, JsonSeriali resolver.AddReference(id, client); string? name = null; + string? @namespace = null; string? summary = null; string? doc = null; IReadOnlyList? operations = null; @@ -45,6 +46,7 @@ public override void Write(Utf8JsonWriter writer, InputClient value, JsonSeriali while (reader.TokenType != JsonTokenType.EndObject) { var isKnownProperty = reader.TryReadString(nameof(InputClient.Name), ref name) + || reader.TryReadString("ClientNamespace", ref @namespace) || reader.TryReadString("Summary", ref summary) || reader.TryReadString("Doc", ref doc) || reader.TryReadWithConverter(nameof(InputClient.Operations), options, ref operations) @@ -59,6 +61,7 @@ public override void Write(Utf8JsonWriter writer, InputClient value, JsonSeriali } client.Name = name ?? throw new JsonException("InputClient must have name"); + client.Namespace = @namespace ?? string.Empty; client.Summary = summary; client.Doc = doc; client.Operations = operations ?? Array.Empty(); @@ -66,7 +69,28 @@ public override void Write(Utf8JsonWriter writer, InputClient value, JsonSeriali client.Parent = parent; client.Decorators = decorators ?? []; + if (GetLastSegment(client.Namespace) == client.Name) + { + // invalid namespace segment found + // check if the list is already there + // get the list out + var invalidNamespaceSegments = (List)resolver.ResolveReference(TypeSpecSerialization.InvalidNamespaceSegmentsKey); + invalidNamespaceSegments.Add(client.Name); + } + return client; } + + private static string GetLastSegment(string clientNamespace) + { + var span = clientNamespace.AsSpan(); + var index = span.LastIndexOf('.'); + if (index == -1) + { + return clientNamespace; + } + + return span.Slice(index + 1).ToString(); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputEnumTypeConverter.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputEnumTypeConverter.cs index 82fb7d3de68..7a017d4c986 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputEnumTypeConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputEnumTypeConverter.cs @@ -26,6 +26,7 @@ public override void Write(Utf8JsonWriter writer, InputEnumType value, JsonSeria public static InputEnumType CreateEnumType(ref Utf8JsonReader reader, string? id, string? name, JsonSerializerOptions options, ReferenceResolver resolver) { var isFirstProperty = id == null && name == null; + string? @namespace = null; string? crossLanguageDefinitionId = null; string? accessibility = null; string? deprecated = null; @@ -41,6 +42,7 @@ public static InputEnumType CreateEnumType(ref Utf8JsonReader reader, string? id { var isKnownProperty = reader.TryReadReferenceId(ref isFirstProperty, ref id) || reader.TryReadString("name", ref name) + || reader.TryReadString("clientNamespace", ref @namespace) || reader.TryReadString("crossLanguageDefinitionId", ref crossLanguageDefinitionId) || reader.TryReadString("access", ref accessibility) || reader.TryReadString("deprecation", ref deprecated) @@ -79,7 +81,7 @@ public static InputEnumType CreateEnumType(ref Utf8JsonReader reader, string? id throw new JsonException("The ValueType of an EnumType must be a primitive type."); } - var enumType = new InputEnumType(name, crossLanguageDefinitionId ?? string.Empty, accessibility, deprecated, summary, doc, usage, inputValueType, values, !isFixed) + var enumType = new InputEnumType(name, @namespace ?? string.Empty, crossLanguageDefinitionId ?? string.Empty, accessibility, deprecated, summary, doc, usage, inputValueType, values, !isFixed) { Decorators = decorators ?? [] }; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputModelTypeConverter.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputModelTypeConverter.cs index acdf9008cde..572dfca5b6e 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputModelTypeConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputModelTypeConverter.cs @@ -35,6 +35,7 @@ internal static InputModelType CreateModelType(ref Utf8JsonReader reader, string // create an empty model to resolve circular references var model = new InputModelType( name: name!, + @namespace: null!, crossLanguageDefinitionId: null!, access: null, deprecation: null, @@ -52,6 +53,7 @@ internal static InputModelType CreateModelType(ref Utf8JsonReader reader, string serializationOptions: null!); resolver.AddReference(id, model); + string? @namespace = null; string? crossLanguageDefinitionId = null; string? accessibility = null; string? deprecation = null; @@ -72,6 +74,7 @@ internal static InputModelType CreateModelType(ref Utf8JsonReader reader, string while (reader.TokenType != JsonTokenType.EndObject) { var isKnownProperty = reader.TryReadString("name", ref name) + || reader.TryReadString("clientNamespace", ref @namespace) || reader.TryReadString("crossLanguageDefinitionId", ref crossLanguageDefinitionId) || reader.TryReadString("access", ref accessibility) || reader.TryReadString("deprecation", ref deprecation) @@ -95,6 +98,7 @@ internal static InputModelType CreateModelType(ref Utf8JsonReader reader, string } model.Name = name ?? throw new JsonException("InputModelType must have name"); + model.Namespace = @namespace ?? string.Empty; model.CrossLanguageDefinitionId = crossLanguageDefinitionId ?? string.Empty; model.Access = accessibility; model.Deprecation = deprecation; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputNamespaceConverter.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputNamespaceConverter.cs index aa85b124c9e..235157fb800 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputNamespaceConverter.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecInputNamespaceConverter.cs @@ -30,6 +30,9 @@ public override void Write(Utf8JsonWriter writer, InputNamespace value, JsonSeri reader.Read(); } + var invalidNamespaceSegments = new List(); + resolver.AddReference(TypeSpecSerialization.InvalidNamespaceSegmentsKey, invalidNamespaceSegments); + string? name = null; IReadOnlyList? apiVersions = null; IReadOnlyList? enums = null; @@ -65,7 +68,8 @@ public override void Write(Utf8JsonWriter writer, InputNamespace value, JsonSeri enums, models, clients, - auth); + auth, + invalidNamespaceSegments); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecSerialization.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecSerialization.cs index 40dc6ce5600..d2fdec0adbd 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecSerialization.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp.Input/src/InputTypes/Serialization/TypeSpecSerialization.cs @@ -9,6 +9,7 @@ namespace Microsoft.Generator.CSharp.Input { public static class TypeSpecSerialization { + internal const string InvalidNamespaceSegmentsKey = "InvalidNamespaceSegments"; public static InputNamespace? Deserialize(string json) { var referenceHandler = new TypeSpecReferenceHandler(); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/perf/CodeWriterBenchmark.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/perf/CodeWriterBenchmark.cs index 7026b1aae57..c8e2b1479b8 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/perf/CodeWriterBenchmark.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/perf/CodeWriterBenchmark.cs @@ -21,7 +21,7 @@ public CodeWriterBenchmark() { new InputModelProperty("MyProperty", null, "The property of mine", InputPrimitiveType.Int32, true, false, false, new(json: new("myProperty"))) }; - var inputModel = new InputModelType("MyModel", string.Empty, null, null, null, "Test model", InputModelTypeUsage.Input | InputModelTypeUsage.Output, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new()); + var inputModel = new InputModelType("MyModel", "MyNamespace", string.Empty, null, null, null, "Test model", InputModelTypeUsage.Input | InputModelTypeUsage.Output, properties, null, Array.Empty(), null, null, new Dictionary(), null, false, new()); var modelProvider = new ModelProvider(inputModel); _writer = new TypeProviderWriter(modelProvider); } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs index 6a237eb4d0d..e2a6e857788 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Configuration.cs @@ -13,13 +13,6 @@ namespace Microsoft.Generator.CSharp /// public class Configuration { - private static readonly string[] _badNamespaces = - [ - "Type", - "Array", - "Enum", - ]; - internal enum UnreferencedTypesHandlingOption { RemoveOrInternalize = 0, @@ -36,8 +29,6 @@ protected Configuration() OutputDirectory = null!; AdditionalConfigOptions = null!; LibraryName = null!; - RootNamespace = null!; - ModelNamespace = null!; } private Configuration( @@ -45,8 +36,6 @@ private Configuration( Dictionary additionalConfigOptions, bool clearOutputFolder, string libraryName, - bool useModelNamespace, - string libraryNamespace, bool disableXmlDocs, UnreferencedTypesHandlingOption unreferencedTypesHandling) { @@ -54,69 +43,10 @@ private Configuration( AdditionalConfigOptions = additionalConfigOptions; ClearOutputFolder = clearOutputFolder; LibraryName = libraryName; - UseModelNamespace = useModelNamespace; - RootNamespace = GetCleanNameSpace(libraryNamespace); - ModelNamespace = useModelNamespace ? $"{RootNamespace}.Models" : RootNamespace; DisableXmlDocs = disableXmlDocs; UnreferencedTypesHandling = unreferencedTypesHandling; } - private string GetCleanNameSpace(string libraryNamespace) - { - Span dest = stackalloc char[libraryNamespace.Length + GetSegmentCount(libraryNamespace)]; - var source = libraryNamespace.AsSpan(); - var destIndex = 0; - var nextDot = source.IndexOf('.'); - while (nextDot != -1) - { - var segment = source.Slice(0, nextDot); - if (IsSpecialSegment(segment)) - { - dest[destIndex] = '_'; - destIndex++; - } - segment.CopyTo(dest.Slice(destIndex)); - destIndex += segment.Length; - dest[destIndex] = '.'; - destIndex++; - source = source.Slice(nextDot + 1); - nextDot = source.IndexOf('.'); - } - if (IsSpecialSegment(source)) - { - dest[destIndex] = '_'; - destIndex++; - } - source.CopyTo(dest.Slice(destIndex)); - destIndex += source.Length; - return dest.Slice(0, destIndex).ToString(); - } - - private bool IsSpecialSegment(ReadOnlySpan readOnlySpan) - { - for (int i = 0; i < _badNamespaces.Length; i++) - { - if (readOnlySpan.Equals(_badNamespaces[i], StringComparison.Ordinal)) - { - return true; - } - } - return false; - } - - private static int GetSegmentCount(string libraryNamespace) - { - int count = 0; - for (int i = 0; i < libraryNamespace.Length; i++) - { - if (libraryNamespace[i] == '.') - { - count++; - } - } - return ++count; - } - /// /// Contains the known set of configuration options. /// @@ -124,8 +54,6 @@ private static class Options { public const string ClearOutputFolder = "clear-output-folder"; public const string LibraryName = "library-name"; - public const string Namespace = "namespace"; - public const string UseModelNamespace = "use-model-namespace"; public const string DisableXmlDocs = "disable-xml-docs"; public const string UnreferencedTypesHandling = "unreferenced-types-handling"; } @@ -135,12 +63,6 @@ private static class Options /// public bool DisableXmlDocs { get; } - /// Gets the root namespace for the library. - public string RootNamespace { get; } - - /// Gets the namespace for the models. - public string ModelNamespace { get; } - /// /// Gets the root output directory for the generated library. /// @@ -186,11 +108,6 @@ private static class Options // The additional configuration options read from the input configuration file. public Dictionary AdditionalConfigOptions { get; } - /// - /// True if the models contain a separate namespace. - /// - internal bool UseModelNamespace { get; private set; } - /// /// Initializes the configuration from the given path to the configuration file. /// @@ -212,8 +129,6 @@ internal static Configuration Load(string outputPath, string? json = null) ParseAdditionalConfigOptions(root), ReadOption(root, Options.ClearOutputFolder), ReadRequiredStringOption(root, Options.LibraryName), - ReadOption(root, Options.UseModelNamespace), - ReadRequiredStringOption(root, Options.Namespace), ReadOption(root, Options.DisableXmlDocs), ReadEnumOption(root, Options.UnreferencedTypesHandling)); } @@ -223,7 +138,6 @@ internal static Configuration Load(string outputPath, string? json = null) /// private static readonly Dictionary _defaultBoolOptionValues = new() { - { Options.UseModelNamespace, true }, { Options.ClearOutputFolder, true }, { Options.DisableXmlDocs, false }, }; @@ -235,8 +149,6 @@ internal static Configuration Load(string outputPath, string? json = null) { Options.ClearOutputFolder, Options.LibraryName, - Options.UseModelNamespace, - Options.Namespace, Options.DisableXmlDocs, Options.UnreferencedTypesHandling, }; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Primitives/NewProjectScaffolding.cs index 7b7e4e73f5f..2f428545a3c 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Primitives/NewProjectScaffolding.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Primitives/NewProjectScaffolding.cs @@ -34,7 +34,7 @@ public async Task Execute() private async Task WriteProjectFiles() { await File.WriteAllBytesAsync( - Path.Combine(CodeModelPlugin.Instance.Configuration.ProjectDirectory, $"{CodeModelPlugin.Instance.Configuration.RootNamespace}.csproj"), + Path.Combine(CodeModelPlugin.Instance.Configuration.ProjectDirectory, $"{CodeModelPlugin.Instance.Configuration.LibraryName}.csproj"), Encoding.UTF8.GetBytes(NormalizeLineEndings(GetSourceProjectFileContent()))); } @@ -46,7 +46,7 @@ private string NormalizeLineEndings(string content) private async Task WriteSolutionFiles() { await File.WriteAllBytesAsync( - Path.Combine(CodeModelPlugin.Instance.Configuration.OutputDirectory, $"{CodeModelPlugin.Instance.Configuration.RootNamespace}.sln"), + Path.Combine(CodeModelPlugin.Instance.Configuration.OutputDirectory, $"{CodeModelPlugin.Instance.Configuration.LibraryName}.sln"), Encoding.UTF8.GetBytes(NormalizeLineEndings(GetSolutionFileContent()))); } @@ -54,10 +54,10 @@ protected virtual string GetSourceProjectFileContent() { var builder = new CSharpProjectWriter() { - Description = $"This is the {CodeModelPlugin.Instance.Configuration.RootNamespace} client library for developing .NET applications with rich experience.", - AssemblyTitle = $"SDK Code Generation {CodeModelPlugin.Instance.Configuration.RootNamespace}", + Description = $"This is the {CodeModelPlugin.Instance.Configuration.LibraryName} client library for developing .NET applications with rich experience.", + AssemblyTitle = $"SDK Code Generation {CodeModelPlugin.Instance.Configuration.LibraryName}", Version = "1.0.0-beta.1", - PackageTags = CodeModelPlugin.Instance.Configuration.RootNamespace, + PackageTags = CodeModelPlugin.Instance.Configuration.LibraryName, TargetFramework = "netstandard2.0", LangVersion = "latest", GenerateDocumentationFile = true, @@ -130,7 +130,7 @@ protected virtual string GetSolutionFileContent() EndGlobalSection EndGlobal "; - return string.Format(slnContent, CodeModelPlugin.Instance.Configuration.RootNamespace); + return string.Format(slnContent, CodeModelPlugin.Instance.Configuration.LibraryName); } } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json index 7893edf6b46..eaca20b1dc2 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json @@ -25,11 +25,6 @@ "commandName": "Executable", "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe" }, - "http-client-naming": { - "commandLineArgs": "$(SolutionDir)/TestProjects/CadlRanch/http/client/naming -p StubLibraryPlugin", - "commandName": "Executable", - "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe" - }, "http-client-structure-client-operation-group": { "commandLineArgs": "$(SolutionDir)/TestProjects/CadlRanch/http/client/structure/client-operation-group -p StubLibraryPlugin", "commandName": "Executable", diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/EnumProvider.cs index 4bcd01df382..9401402899b 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/EnumProvider.cs @@ -55,7 +55,9 @@ protected override TypeProvider[] BuildSerializationProviders() { return [.. CodeModelPlugin.Instance.TypeFactory.CreateSerializations(_inputType, this)]; } - protected override string BuildNamespace() => CodeModelPlugin.Instance.Configuration.ModelNamespace; + protected override string BuildNamespace() => string.IsNullOrEmpty(_inputType.Namespace) ? + CodeModelPlugin.Instance.TypeFactory.RootNamespace : // we default to this model namespace when the namespace is empty + CodeModelPlugin.Instance.TypeFactory.GetCleanNameSpace(_inputType.Namespace); protected override bool GetIsEnum() => true; protected override CSharpType BuildEnumUnderlyingType() => CodeModelPlugin.Instance.TypeFactory.CreateCSharpType(_inputType.ValueType) ?? throw new InvalidOperationException($"Failed to create CSharpType for {_inputType.ValueType}"); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ExtensibleEnumProvider.cs index dba1e598c07..74591d0f1e4 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ExtensibleEnumProvider.cs @@ -21,7 +21,7 @@ internal sealed class ExtensibleEnumProvider : EnumProvider private readonly IReadOnlyList _allowedValues; private readonly TypeSignatureModifiers _modifiers; private readonly InputEnumType _inputType; - internal ExtensibleEnumProvider(InputEnumType input, TypeProvider? declaringType): base(input) + internal ExtensibleEnumProvider(InputEnumType input, TypeProvider? declaringType) : base(input) { _inputType = input; _allowedValues = input.Values; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/FixedEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/FixedEnumProvider.cs index 856e59d9df1..145b9fb2ac9 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/FixedEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/FixedEnumProvider.cs @@ -44,7 +44,7 @@ protected override FormattableString Description => _isApiVersionEnum ? $"The version of the service to use." : base.Description; protected override string BuildNamespace() - => _isApiVersionEnum ? CodeModelPlugin.Instance.Configuration.RootNamespace : base.BuildNamespace(); + => _isApiVersionEnum ? CodeModelPlugin.Instance.TypeFactory.RootNamespace : base.BuildNamespace(); protected override TypeProvider[] BuildSerializationProviders() { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelFactoryProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelFactoryProvider.cs index 266cf188c88..fcbeaf0cef2 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelFactoryProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelFactoryProvider.cs @@ -54,7 +54,7 @@ protected override string BuildName() protected override TypeSignatureModifiers BuildDeclarationModifiers() => TypeSignatureModifiers.Static | TypeSignatureModifiers.Partial | TypeSignatureModifiers.Class; - protected override string BuildNamespace() => CodeModelPlugin.Instance.Configuration.ModelNamespace; + protected override string BuildNamespace() => CodeModelPlugin.Instance.TypeFactory.GetCleanNameSpace(CodeModelPlugin.Instance.InputLibrary.InputNamespace.Name); protected override XmlDocProvider BuildXmlDocs() { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelProvider.cs index 826fe87e214..9a6bca9c4c5 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/ModelProvider.cs @@ -86,7 +86,9 @@ public ModelProvider? BaseModelProvider internal bool SupportsBinaryDataAdditionalProperties => AdditionalPropertyProperties.Any(p => p.Type.ElementType.Equals(_additionalPropsUnknownType)); public ConstructorProvider FullConstructor => _fullConstructor ??= BuildFullConstructor(); - protected override string BuildNamespace() => CodeModelPlugin.Instance.Configuration.ModelNamespace; + protected override string BuildNamespace() => string.IsNullOrEmpty(_inputModel.Namespace) ? + CodeModelPlugin.Instance.TypeFactory.RootNamespace : + CodeModelPlugin.Instance.TypeFactory.GetCleanNameSpace(_inputModel.Namespace); protected override CSharpType? GetBaseType() { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs index 91965ae0d0c..05a365cd387 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs @@ -119,7 +119,7 @@ public string? Deprecated protected virtual bool GetIsEnum() => false; public bool IsEnum => GetIsEnum(); - protected virtual string BuildNamespace() => CodeModelPlugin.Instance.Configuration.RootNamespace; + protected virtual string BuildNamespace() => CodeModelPlugin.Instance.TypeFactory.RootNamespace; private TypeSignatureModifiers? _declarationModifiers; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Snippets/Snippet.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Snippets/Snippet.cs index 30852ba80b0..69455f79796 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Snippets/Snippet.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Snippets/Snippet.cs @@ -125,28 +125,33 @@ public static ValueExpression Property(this ParameterProvider parameter, string public static ValueExpression Property(this FieldProvider field, string propertyName, bool nullConditional = false) => new MemberExpression(nullConditional ? new NullConditionalExpression(field) : field, propertyName); - public static InvokeMethodExpression Invoke(this FieldProvider field, string methodName, IEnumerable parameters) - => field.Invoke(methodName, parameters, false, false); + public static InvokeMethodExpression Invoke(this FieldProvider field, string methodName, IEnumerable parameters, CSharpType? extensionType = null) + => field.Invoke(methodName, parameters, false, false, extensionType: extensionType); public static InvokeMethodExpression Invoke(this FieldProvider field, string methodName, IEnumerable parameters, bool isAsync, - bool configureAwait) + bool configureAwait, + CSharpType? extensionType = null) => new InvokeMethodExpression(field, methodName, [.. parameters]) { - CallAsAsync = isAsync, AddConfigureAwaitFalse = configureAwait + CallAsAsync = isAsync, + AddConfigureAwaitFalse = configureAwait, + ExtensionType = extensionType }; public static ValueExpression Invoke(this PropertyProvider property, string methodName, IEnumerable parameters, bool isAsync, - bool configureAwait) + bool configureAwait, + CSharpType? extensionType = null) => new InvokeMethodExpression(property, methodName, [.. parameters]) { CallAsAsync = isAsync, - AddConfigureAwaitFalse = configureAwait + AddConfigureAwaitFalse = configureAwait, + ExtensionType = extensionType }; public static ScopedApi NotEqual(this ParameterProvider parameter, ValueExpression other) diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/SourceInput/SourceInputModel.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/SourceInput/SourceInputModel.cs index eb82c9f3d3a..ceea7eed27d 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/SourceInput/SourceInputModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/SourceInput/SourceInputModel.cs @@ -97,7 +97,7 @@ private bool TryGetName(ISymbol symbol, [NotNullWhen(true)] out string? name) private async Task LoadBaselineContract() { string fullPath; - string projectFilePath = Path.GetFullPath(Path.Combine(CodeModelPlugin.Instance.Configuration.ProjectDirectory, $"{CodeModelPlugin.Instance.Configuration.RootNamespace}.csproj")); + string projectFilePath = Path.GetFullPath(Path.Combine(CodeModelPlugin.Instance.Configuration.ProjectDirectory, $"{CodeModelPlugin.Instance.TypeFactory.RootNamespace}.csproj")); if (!File.Exists(projectFilePath)) return null; @@ -106,15 +106,15 @@ private bool TryGetName(ISymbol symbol, [NotNullWhen(true)] out string? name) if (baselineVersion is not null) { var nugetGlobalPackageFolder = SettingsUtility.GetGlobalPackagesFolder(new NullSettings()); - var nugetFolder = Path.Combine(nugetGlobalPackageFolder, CodeModelPlugin.Instance.Configuration.RootNamespace.ToLowerInvariant(), baselineVersion, "lib", "netstandard2.0"); - fullPath = Path.Combine(nugetFolder, $"{CodeModelPlugin.Instance.Configuration.RootNamespace}.dll"); + var nugetFolder = Path.Combine(nugetGlobalPackageFolder, CodeModelPlugin.Instance.TypeFactory.RootNamespace.ToLowerInvariant(), baselineVersion, "lib", "netstandard2.0"); + fullPath = Path.Combine(nugetFolder, $"{CodeModelPlugin.Instance.TypeFactory.RootNamespace}.dll"); if (File.Exists(fullPath)) { - return await GeneratedCodeWorkspace.CreatePreviousContractFromDll(Path.Combine(nugetFolder, $"{CodeModelPlugin.Instance.Configuration.RootNamespace}.xml"), fullPath); + return await GeneratedCodeWorkspace.CreatePreviousContractFromDll(Path.Combine(nugetFolder, $"{CodeModelPlugin.Instance.TypeFactory.RootNamespace}.xml"), fullPath); } else { - throw new InvalidOperationException($"Can't find Baseline contract assembly ({CodeModelPlugin.Instance.Configuration.RootNamespace}@{baselineVersion}) from Nuget Global Package Folder at {fullPath}. " + + throw new InvalidOperationException($"Can't find Baseline contract assembly ({CodeModelPlugin.Instance.TypeFactory.RootNamespace}@{baselineVersion}) from Nuget Global Package Folder at {fullPath}. " + $"Please make sure the baseline nuget package has been installed properly"); } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs index d5f2c23ff26..2349193e87d 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs @@ -326,5 +326,65 @@ public EnumCacheKey(InputEnumType enumType, TypeProvider? declaringType) DeclaringType = declaringType; } } + + private string? _rootNamespace; + public virtual string RootNamespace => _rootNamespace ??= GetCleanNameSpace(CodeModelPlugin.Instance.InputLibrary.InputNamespace.Name); + + public string GetCleanNameSpace(string clientNamespace) + { + Span dest = stackalloc char[clientNamespace.Length + GetSegmentCount(clientNamespace)]; + var source = clientNamespace.AsSpan(); + var destIndex = 0; + var nextDot = source.IndexOf('.'); + while (nextDot != -1) + { + var segment = source.Slice(0, nextDot); + if (IsSpecialSegment(segment)) + { + dest[destIndex] = '_'; + destIndex++; + } + segment.CopyTo(dest.Slice(destIndex)); + destIndex += segment.Length; + dest[destIndex] = '.'; + destIndex++; + source = source.Slice(nextDot + 1); + nextDot = source.IndexOf('.'); + } + if (IsSpecialSegment(source)) + { + dest[destIndex] = '_'; + destIndex++; + } + source.CopyTo(dest.Slice(destIndex)); + destIndex += source.Length; + return dest.Slice(0, destIndex).ToString(); + } + + private bool IsSpecialSegment(ReadOnlySpan readOnlySpan) + { + var badNamespaceSegments = CodeModelPlugin.Instance.InputLibrary.InputNamespace.InvalidNamespaceSegments; + for (int i = 0; i < badNamespaceSegments.Count; i++) + { + if (readOnlySpan.Equals(badNamespaceSegments[i], StringComparison.Ordinal)) + { + return true; + } + } + return false; + } + + private static int GetSegmentCount(string clientNamespace) + { + int count = 0; + for (int i = 0; i < clientNamespace.Length; i++) + { + if (clientNamespace[i] == '.') + { + count++; + } + } + return ++count; + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/ConfigurationTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/ConfigurationTests.cs index 71aa3b08758..bce93c1bfad 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/ConfigurationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/ConfigurationTests.cs @@ -19,15 +19,11 @@ public class ConfigurationTests [Test] public void TestInitialize() { - string ns = "Sample"; string? unknownStringProperty = "unknownPropertyValue"; bool? unknownBoolProp = false; var configuration = Configuration.Load(MockHelpers.TestHelpersFolder); - var parsedNs = configuration.RootNamespace; - - Assert.AreEqual(ns, parsedNs); // get the unknown property from the configuration var additionalConfigOptions = configuration.AdditionalConfigOptions; Assert.IsNotNull(additionalConfigOptions); @@ -84,32 +80,6 @@ public void TestParseConfig_LibraryName(string mockJson, bool throwsError) Assert.AreEqual(expected, library); } - // Validates that the namespace field is parsed correctly from the configuration - [TestCaseSource("ParseConfigNamespaceTestCases")] - public void TestParseConfig_Namespace(string mockJson, bool throwsError) - { - if (throwsError) - { - Assert.Throws(() => MockHelpers.LoadMockPlugin(configuration: mockJson)); - return; - } - - var ns = CodeModelPlugin.Instance.Configuration.RootNamespace; - var expected = "namespace"; - - Assert.AreEqual(expected, ns); - } - - // Validates that the output folder is parsed correctly from the configuration - [TestCaseSource("ParseConfigUseModelNamespaceTestCases")] - public void TestParseConfig_UseModelNamespace(string mockJson, bool expected) - { - MockHelpers.LoadMockPlugin(configuration: mockJson); - var useModelNs = CodeModelPlugin.Instance.Configuration.UseModelNamespace; - - Assert.AreEqual(expected, useModelNs); - } - // Validates that additional configuration options are parsed correctly [Test] public void TestParseConfig_AdditionalConfigOptions() @@ -117,7 +87,6 @@ public void TestParseConfig_AdditionalConfigOptions() var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", ""unknown-string-property"": ""unknownPropertyValue"", ""unknown-bool-property"": true }"; @@ -142,7 +111,6 @@ public void DisableDocsForProperty() var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", ""disable-xml-docs"": true }"; @@ -165,7 +133,6 @@ public void UnreferencedTypeHandling(string input) var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", ""unreferenced-types-handling"": ""keepAll"" }"; @@ -187,7 +154,6 @@ public void DisableDocsForMethod() var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", ""disable-xml-docs"": true }"; @@ -215,7 +181,6 @@ public void DisableDocsForType() var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""Test"", ""disable-xml-docs"": true }"; @@ -233,7 +198,6 @@ public void DisableDocsForField() var mockJson = @"{ ""output-folder"": ""outputFolder"", ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", ""disable-xml-docs"": true }"; @@ -251,13 +215,11 @@ public static IEnumerable ParseConfigOutputFolderTestCases get { yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"" + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"" }", false); yield return new TestCaseData(@"{ - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"" + ""library-name"": ""libraryName"" }", true); } } @@ -267,12 +229,11 @@ public static IEnumerable ParseConfigLibraryNameTestCases get { yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"" + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"", }", false); yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"" + ""output-folder"": ""outputFolder"" }", true); } } @@ -282,13 +243,12 @@ public static IEnumerable ParseConfigNamespaceTestCases get { yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"" + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"", }", false); yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"" + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"" }", true); } } @@ -298,15 +258,13 @@ public static IEnumerable ParseConfigUseModelNamespaceTestCases get { yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"", + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"", ""use-model-namespace"": true }", true); yield return new TestCaseData(@"{ - ""output-folder"": ""outputFolder"", - ""library-name"": ""libraryName"", - ""namespace"": ""namespace"" + ""output-folder"": ""outputFolder"", + ""library-name"": ""libraryName"", }", true); } } diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs index 60fb01afc5b..f04fcbd46a9 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs @@ -35,7 +35,7 @@ public void PreVisitsProperties() { _mockPlugin.Object.AddVisitor(_mockVisitor.Object); var inputModelProperty = InputFactory.Property("prop1", InputPrimitiveType.Any, true, true); - var inputModel = InputFactory.Model("foo", "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); + var inputModel = InputFactory.Model("foo", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace("test library", models: [inputModel])); @@ -51,7 +51,7 @@ public void PreVisitsEnum() _mockPlugin.Object.AddVisitor(_mockVisitor.Object); var inputEnum = InputFactory.Enum("enum", InputPrimitiveType.Int32, usage: InputModelTypeUsage.Input, values: [InputFactory.EnumMember.Int32("value", 1)]); var inputModelProperty = InputFactory.Property("prop1", inputEnum, true, true); - var inputModel = InputFactory.Model("foo", "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); + var inputModel = InputFactory.Model("foo", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace("test library", models: [inputModel])); @@ -66,7 +66,7 @@ public void PreVisitsModel() _mockPlugin.Object.AddVisitor(_mockVisitor.Object); var inputEnum = InputFactory.Enum("enum", InputPrimitiveType.Int32, usage: InputModelTypeUsage.Input, values: [InputFactory.EnumMember.Int32("value", 1)]); var inputModelProperty = InputFactory.Property("prop1", inputEnum, true, true); - var inputModel = InputFactory.Model("foo", "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); + var inputModel = InputFactory.Model("foo", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModelProperty]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace("test library", models: [inputModel])); @@ -79,11 +79,11 @@ public void PreVisitsModel() public void RemovedInputModelCausesExceptionWhenReferencedInDifferentModel() { var inputModel1Property = InputFactory.Property("prop1", InputPrimitiveType.Any, true, true); - var inputModel1 = InputFactory.Model("Model1", "internal", usage: InputModelTypeUsage.Input, properties: [inputModel1Property]); + var inputModel1 = InputFactory.Model("Model1", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModel1Property]); var inputModel2Property = InputFactory.Property("prop2", inputModel1, true, true); - var inputModel2 = InputFactory.Model("Model2", "internal", usage: InputModelTypeUsage.Input, properties: [inputModel2Property]); + var inputModel2 = InputFactory.Model("Model2", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModel2Property]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace("test library", models: [inputModel1, inputModel2])); @@ -96,11 +96,11 @@ public void RemovedInputModelCausesExceptionWhenReferencedInDifferentModel() public void CanCleanUpRemovedReferencesToRemovedModels() { var inputModel1Property = InputFactory.Property("prop1", InputPrimitiveType.Any, true, true); - var inputModel1 = InputFactory.Model("Model1", "internal", usage: InputModelTypeUsage.Input, properties: [inputModel1Property]); + var inputModel1 = InputFactory.Model("Model1", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModel1Property]); var inputModel2Property = InputFactory.Property("prop2", inputModel1, true, true); - var inputModel2 = InputFactory.Model("Model2", "internal", usage: InputModelTypeUsage.Input, properties: [inputModel2Property]); + var inputModel2 = InputFactory.Model("Model2", access: "internal", usage: InputModelTypeUsage.Input, properties: [inputModel2Property]); _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace("test library", models: [inputModel1, inputModel2])); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/CanonicalTypeProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/CanonicalTypeProviderTests.cs index cd536a26f78..1d0d565960f 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/CanonicalTypeProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/CanonicalTypeProviderTests.cs @@ -81,7 +81,7 @@ private class TestTypeProvider : TypeProvider protected override string BuildName() => "TestName"; - protected override string BuildNamespace() => CodeModelPlugin.Instance.Configuration.ModelNamespace; + protected override string BuildNamespace() => "Sample.Models"; protected override TypeSignatureModifiers BuildDeclarationModifiers() => TypeSignatureModifiers.Internal | TypeSignatureModifiers.Partial |TypeSignatureModifiers.Class; diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/ModelFactoryProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/ModelFactoryProviderTests.cs index 90d4bf861cf..c1444d8e9a3 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/ModelFactoryProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/ModelFactoryProviderTests.cs @@ -146,7 +146,7 @@ private static InputModelType[] GetTestModels() var derivedModel = InputFactory.Model("DerivedModel", properties: inheritanceProperties, discriminatedKind: "foo"); return [ - InputFactory.Model("InternalModel", "internal", properties: properties), + InputFactory.Model("InternalModel", access: "internal", properties: properties), InputFactory.Model("PublicModel1", properties: properties), InputFactory.Model("PublicModel2", properties: properties), derivedModel, diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanChangeAccessibilityOfModelFactory/SampleNamespaceModelFactory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanChangeAccessibilityOfModelFactory/SampleNamespaceModelFactory.cs index 08e54a10a02..a91109a5a10 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanChangeAccessibilityOfModelFactory/SampleNamespaceModelFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanChangeAccessibilityOfModelFactory/SampleNamespaceModelFactory.cs @@ -1,7 +1,7 @@ using UnbrandedTypeSpec; using System; -namespace Sample.Models +namespace Sample { internal static partial class SampleNamespaceModelFactory { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanReplaceModelMethod/SampleNamespaceModelFactory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanReplaceModelMethod/SampleNamespaceModelFactory.cs index 35f75bd7feb..8b7ced7e918 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanReplaceModelMethod/SampleNamespaceModelFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelFactories/TestData/ModelFactoriesCustomizationTests/CanReplaceModelMethod/SampleNamespaceModelFactory.cs @@ -1,7 +1,7 @@ using UnbrandedTypeSpec; using System; -namespace Sample.Models +namespace Sample { public static partial class SampleNamespaceModelFactory { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs index bb38226a00b..7f8e0f14844 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs @@ -786,8 +786,8 @@ public async Task CanCustomizeDiscriminatorModel() var barModel = InputFactory.Model("barModel", properties: [modelProp, discriminatorProp], usage: InputModelTypeUsage.Json, discriminatedKind: "bar"); var inputModel = InputFactory.Model( "mockInputModel", - properties: [modelProp, discriminatorProp], derivedModels: [fooModel, barModel], - usage: InputModelTypeUsage.Json); + properties: [modelProp, discriminatorProp], + derivedModels: [fooModel, barModel], usage: InputModelTypeUsage.Json); var plugin = await MockHelpers.LoadMockPluginAsync( inputModelTypes: [inputModel, fooModel, barModel], diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs index d7973c6c7fd..7fd530b7c6a 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/TestData/ModelCustomizationTests/CanCustomizePropertyIntoReadOnlyMemory.cs @@ -3,8 +3,9 @@ #nullable disable using System; +using Sample.Models; -namespace Sample.Models +namespace Sample { /// A factory class for creating instances of the models for mocking. public static partial class SampleNamespaceModelFactory diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/Configuration.json b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/Configuration.json index 6799f791bc7..292074277bc 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/Configuration.json +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/Configuration.json @@ -1,7 +1,6 @@ { "output-folder": "./outputFolder", "project-folder": "./projectFolder", - "namespace": "Sample", "unknown-bool-property": false, "library-name": "Sample.Namespace", "unknown-string-property": "unknownPropertyValue" diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/MockHelpers.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/MockHelpers.cs index b8e04c950b7..5f5570d7d71 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/MockHelpers.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/MockHelpers.cs @@ -93,7 +93,7 @@ public static Mock LoadMockPlugin( Mock mockInputLibrary = new Mock() { CallBase = true }; mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace( - "TestLibrary", + "Sample", models: inputModelTypes, enums: inputEnumTypes)); diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestNamedSymbol.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestNamedSymbol.cs index e5fac7ee7ae..b18a7b53024 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestNamedSymbol.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestNamedSymbol.cs @@ -18,7 +18,7 @@ public class NamedSymbol : TypeProvider protected override string BuildName() => _typeName; - protected override string BuildNamespace() => CodeModelPlugin.Instance.Configuration.ModelNamespace; + protected override string BuildNamespace() => "Sample.Models"; public NamedSymbol(Type? propertyType = null, string name = "NamedSymbol") { diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestTypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestTypeProvider.cs index 25dec9b9981..8181966d628 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestTypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/TestHelpers/TestTypeProvider.cs @@ -13,6 +13,8 @@ internal class TestTypeProvider : TypeProvider protected override string BuildName() => "TestName"; + protected override string BuildNamespace() => "Test"; + public static readonly TypeProvider Empty = new TestTypeProvider(); internal TestTypeProvider(TypeSignatureModifiers? declarationModifiers = null) diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/common/InputFactory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/common/InputFactory.cs index 6accbf891a1..85c22b3a41d 100644 --- a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/common/InputFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/common/InputFactory.cs @@ -125,10 +125,12 @@ public static InputEnumType Enum( string access = "public", InputModelTypeUsage usage = InputModelTypeUsage.Output | InputModelTypeUsage.Input, IEnumerable? values = null, - bool isExtensible = false) + bool isExtensible = false, + string clientNamespace = "Sample.Models") { return new InputEnumType( name, + clientNamespace, name, access, null, @@ -163,6 +165,7 @@ public static InputModelProperty Property( public static InputModelType Model( string name, + string clientNamespace = "Sample.Models", string access = "public", InputModelTypeUsage usage = InputModelTypeUsage.Output | InputModelTypeUsage.Input | InputModelTypeUsage.Json, IEnumerable? properties = null, @@ -176,6 +179,7 @@ public static InputModelType Model( IEnumerable propertiesList = properties ?? [Property("StringProperty", InputPrimitiveType.String)]; return new InputModelType( name, + clientNamespace, name, access, null, @@ -252,12 +256,13 @@ public static OperationResponse OperationResponse(IEnumerable? statusCodes ["application/json"]); } - public static InputClient Client(string name, IEnumerable? operations = null, IEnumerable? parameters = null, string? parent = null) + public static InputClient Client(string name, string clientNamespace = "Sample", string? doc = null, IEnumerable? operations = null, IEnumerable? parameters = null, string? parent = null) { return new InputClient( name, - "", - $"{name} description", + clientNamespace, + string.Empty, + doc ?? $"{name} description", operations is null ? [] : [.. operations], parameters is null ? [] : [.. parameters], parent); diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Naming/NamingTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Naming/NamingTests.cs index 32b44ebec8c..79c9a17082b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Naming/NamingTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Naming/NamingTests.cs @@ -1,109 +1,113 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System.Threading.Tasks; -using Client.Naming; -using Client.Naming.Models; -using NUnit.Framework; -using ClientModel = Client.Naming.Models.ClientModel; - -namespace TestProjects.CadlRanch.Tests.Http.Client.Naming -{ - public class ClientNamingTests : CadlRanchTestBase - { - [CadlRanchTest] - public Task Client() => Test(async (host) => - { - var response = await new NamingClient(host, null).ClientAsync(new ClientNameModel(true)); - Assert.AreEqual(204, response.GetRawResponse().Status); - - Assert.NotNull(typeof(ClientNameModel).GetProperty("ClientName")); - Assert.IsNull(typeof(ClientNameModel).GetProperty("DefaultName")); - }); - - [CadlRanchTest] - public Task Language() => Test(async (host) => - { - var response = await new NamingClient(host, null).LanguageAsync(new LanguageClientNameModel(true)); - Assert.AreEqual(204, response.GetRawResponse().Status); - - Assert.NotNull(typeof(LanguageClientNameModel).GetProperty("CSName")); - Assert.IsNull(typeof(LanguageClientNameModel).GetProperty("DefaultName")); - }); - - [CadlRanchTest] - public Task CompatibleWithEncodedName() => Test(async (host) => - { - var response = await new NamingClient(host, null).CompatibleWithEncodedNameAsync(new ClientNameAndJsonEncodedNameModel(true)); - Assert.AreEqual(204, response.GetRawResponse().Status); - - Assert.NotNull(typeof(ClientNameModel).GetProperty("ClientName")); - Assert.IsNull(typeof(ClientNameModel).GetProperty("DefaultName")); - }); - - [CadlRanchTest] - public Task Operation() => Test(async (host) => - { - var response = await new NamingClient(host, null).ClientNameAsync(); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task Parameter() => Test(async (host) => - { - var response = await new NamingClient(host, null).ParameterAsync(clientName: "true"); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task Request() => Test(async (host) => - { - var response = await new NamingClient(host, null).RequestAsync(clientName: "true"); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task Response() => Test(async (host) => - { - var response = await new NamingClient(host, null).ResponseAsync(); - Assert.IsTrue(response.GetRawResponse().Headers.TryGetValue("default-name", out _)); - foreach (var header in response.GetRawResponse().Headers) - { - var key = header.Key; - if (key == "default-name") - { - var value = header.Value; - Assert.AreEqual("true", value); - } - } - }); - - [CadlRanchTest] - public Task ModelClient() => Test(async (host) => - { - var response = await new NamingClient(host, null).GetClientModelClient().ClientAsync(new ClientModel(true)); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task ModelLanguage() => Test(async (host) => - { - var response = await new NamingClient(host, null).GetClientModelClient().LanguageAsync(new CSModel(true)); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task UnionEnumName() => Test(async (host) => - { - var response = await new NamingClient(host, null).GetUnionEnumClient().UnionEnumNameAsync(ClientExtensibleEnum.EnumValue1); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - - [CadlRanchTest] - public Task UnionEnumMemberName() => Test(async (host) => - { - var response = await new NamingClient(host, null).GetUnionEnumClient().UnionEnumMemberNameAsync(ExtensibleEnum.ClientEnumValue1); - Assert.AreEqual(204, response.GetRawResponse().Status); - }); - } -} +// These are temporarily disabled until this issue https://github.com/microsoft/typespec/issues/5653 is resolved. + +// using System.Threading.Tasks; +// using Client.Naming; +// using Client.Naming._UnionEnum; +// using Client.Naming.Model; +// using Client.Naming.Property; +// using NUnit.Framework; +// using ClientModel = Client.Naming.Model.ClientModel; + +// namespace TestProjects.CadlRanch.Tests.Http.Client.Naming +// { +// public class ClientNamingTests : CadlRanchTestBase +// { +// [CadlRanchTest] +// public Task Client() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).ClientAsync(new ClientNameModel(true)); +// Assert.AreEqual(204, response.GetRawResponse().Status); + +// Assert.NotNull(typeof(ClientNameModel).GetProperty("ClientName")); +// Assert.IsNull(typeof(ClientNameModel).GetProperty("DefaultName")); +// }); + +// [CadlRanchTest] +// public Task Language() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).LanguageAsync(new LanguageClientNameModel(true)); +// Assert.AreEqual(204, response.GetRawResponse().Status); + +// Assert.NotNull(typeof(LanguageClientNameModel).GetProperty("CSName")); +// Assert.IsNull(typeof(LanguageClientNameModel).GetProperty("DefaultName")); +// }); + +// [CadlRanchTest] +// public Task CompatibleWithEncodedName() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).CompatibleWithEncodedNameAsync(new ClientNameAndJsonEncodedNameModel(true)); +// Assert.AreEqual(204, response.GetRawResponse().Status); + +// Assert.NotNull(typeof(ClientNameModel).GetProperty("ClientName")); +// Assert.IsNull(typeof(ClientNameModel).GetProperty("DefaultName")); +// }); + +// [CadlRanchTest] +// public Task Operation() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).ClientNameAsync(); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task Parameter() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).ParameterAsync(clientName: "true"); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task Request() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).RequestAsync(clientName: "true"); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task Response() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).ResponseAsync(); +// Assert.IsTrue(response.GetRawResponse().Headers.TryGetValue("default-name", out _)); +// foreach (var header in response.GetRawResponse().Headers) +// { +// var key = header.Key; +// if (key == "default-name") +// { +// var value = header.Value; +// Assert.AreEqual("true", value); +// } +// } +// }); + +// [CadlRanchTest] +// public Task ModelClient() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).GetClientModelClient().ClientAsync(new ClientModel(true)); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task ModelLanguage() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).GetClientModelClient().LanguageAsync(new CSModel(true)); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task UnionEnumName() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).GetUnionEnumClient().UnionEnumNameAsync(ClientExtensibleEnum.EnumValue1); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); + +// [CadlRanchTest] +// public Task UnionEnumMemberName() => Test(async (host) => +// { +// var response = await new NamingClient(host, null).GetUnionEnumClient().UnionEnumMemberNameAsync(ExtensibleEnum.ClientEnumValue1); +// Assert.AreEqual(204, response.GetRawResponse().Status); +// }); +// } +// } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/ClientOperationGroup/ClientOperationGroupTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/ClientOperationGroup/ClientOperationGroupTests.cs index 04974e4ac2e..d6276fe33d8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/ClientOperationGroup/ClientOperationGroupTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/ClientOperationGroup/ClientOperationGroupTests.cs @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias ClientStructureClientOperationGroup; using System.Linq; using System.Threading.Tasks; -using Client.Structure.Service; -using Client.Structure.Service.Models; +using ClientStructureClientOperationGroup::Client.Structure.AnotherClientOperationGroup; +using ClientStructureClientOperationGroup::Client.Structure.ClientOperationGroup; using NUnit.Framework; +using ClientType = ClientStructureClientOperationGroup::Client.Structure.Service.ClientType; namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.ClientOperationGroup { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs index 3d2b7645da0..1a2d975de0a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias ClientStructureDefault; using System; using System.Linq; using System.Threading.Tasks; -using Client.Structure.Service.Default; -using Client.Structure.Service.Default.Models; +using ClientStructureDefault::Client.Structure.Service; +using ClientStructureDefault::Client.Structure.Service._Baz; +using ClientStructureDefault::Client.Structure.Service._Qux; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.Default diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/MultiClient/MultiClientTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/MultiClient/MultiClientTests.cs index f844fe75b3a..e12408ea817 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/MultiClient/MultiClientTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/MultiClient/MultiClientTests.cs @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias ClientStructureMultiClient; using System.Linq; using System.Threading.Tasks; -using Client.Structure.Service.Multi.Client; -using Client.Structure.Service.Multi.Client.Models; +using ClientStructureMultiClient::Client.Structure.MultiClient; using NUnit.Framework; +using ClientType = ClientStructureMultiClient::Client.Structure.Service.ClientType; namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.MultiClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/RenamedOperation/RenamedOperationTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/RenamedOperation/RenamedOperationTests.cs index 461cb0a2579..af5e9cbe041 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/RenamedOperation/RenamedOperationTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/RenamedOperation/RenamedOperationTests.cs @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias ClientStructureRenamedOperation; using System.Linq; using System.Threading.Tasks; -using Client.Structure.Service.Renamed.Operation; -using Client.Structure.Service.Renamed.Operation.Models; +using ClientStructureRenamedOperation::Client.Structure.RenamedOperation; +using ClientStructureRenamedOperation::Client.Structure.Service; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.RenamedOperation diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/TwoOperationGroup/TwoOperationGroupTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/TwoOperationGroup/TwoOperationGroupTests.cs index d279369d177..6e9386ec5df 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/TwoOperationGroup/TwoOperationGroupTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/TwoOperationGroup/TwoOperationGroupTests.cs @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Client.Structure.Service.TwoOperationGroup; -using Client.Structure.Service.TwoOperationGroup.Models; -using NUnit.Framework; +extern alias ClientStructureTwoOperationGroup; using System.ClientModel; using System.Linq; using System.Threading.Tasks; +using ClientStructureTwoOperationGroup::Client.Structure.TwoOperationGroup; +using ClientStructureTwoOperationGroup::Client.Structure.Service; +using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.TwoOperationGroup { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Bytes/EncodeBytesTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Bytes/EncodeBytesTests.cs index 673f26404f6..79a6685391c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Bytes/EncodeBytesTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Bytes/EncodeBytesTests.cs @@ -6,7 +6,6 @@ using System.IO; using System.Threading.Tasks; using Encode.Bytes; -using Encode.Bytes.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Encode.Bytes diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/DateTime/DateTimeTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/DateTime/DateTimeTests.cs index 1a16d07ac5f..ea4b57b1eae 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/DateTime/DateTimeTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/DateTime/DateTimeTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Encode.Datetime; -using Encode.Datetime.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Encode.Datetime diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs index 1b9f2b6c853..af1e97c2430 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs @@ -6,7 +6,7 @@ using System.Text.Json; using System.Threading.Tasks; using Encode.Duration; -using Encode.Duration.Models; +using Encode.Duration._Property; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Encode.Duration diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs index e6f8afcdf77..3949da664b0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Encode.Numeric; -using Encode.Numeric.Models; +using Encode.Numeric._Property; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Encode.Numeric diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Basic/BasicParametersTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Basic/BasicParametersTests.cs index cab8bfd9d06..be4a3c4b468 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Basic/BasicParametersTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Basic/BasicParametersTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using NUnit.Framework; using Parameters.Basic; -using Parameters.Basic.Models; +using Parameters.Basic._ExplicitBody; namespace TestProjects.CadlRanch.Tests.Http.Parameters.Basic { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/BodyOptionality/BodyOptionalityTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/BodyOptionality/BodyOptionalityTests.cs index 7c8296272fc..4380c775d83 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/BodyOptionality/BodyOptionalityTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/BodyOptionality/BodyOptionalityTests.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using NUnit.Framework; using Parameters.BodyOptionality; -using Parameters.BodyOptionality.Models; namespace TestProjects.CadlRanch.Tests.Http.Parameters.BodyOptionality { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Spread/SpreadTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Spread/SpreadTests.cs index 011fb1f231c..eec2f733c9c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Spread/SpreadTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Parameters/Spread/SpreadTests.cs @@ -1,17 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; -using Parameters.Spread.Models; -using Parameters.Spread; -using System.Collections.Generic; -using System.Reflection; -using System.Threading.Tasks; using System; -using System.Linq; using System.ClientModel; using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; using System.Threading; +using System.Threading.Tasks; +using NUnit.Framework; +using Parameters.Spread; +using Parameters.Spread._Alias; +using Parameters.Spread._Model; namespace TestProjects.CadlRanch.Tests.Http.Parameters.Spread { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Payload/JsonMergePatch/JsonMergePatchTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Payload/JsonMergePatch/JsonMergePatchTests.cs index 2fba0cf9047..be49f0c4adc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Payload/JsonMergePatch/JsonMergePatchTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Payload/JsonMergePatch/JsonMergePatchTests.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using NUnit.Framework; using Payload.JsonMergePatch; -using Payload.JsonMergePatch.Models; namespace TestProjects.CadlRanch.Tests.Http.Payload.JsonMergePatch { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs index 92359de9ca1..51cdbdc151a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; -using Resiliency.SrvDriven.V1; +extern alias SrvDrivenV1; + using System.Threading.Tasks; +using NUnit.Framework; +using SrvDrivenV1::Resiliency.ServiceDriven; namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs index cc2dfb99857..c277b4961ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; +extern alias SrvDrivenV2; using System.Threading.Tasks; -using Resiliency.SrvDriven.V2; +using NUnit.Framework; +using SrvDrivenV2::Resiliency.ServiceDriven; namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Serialization/EncodedName/Json/EncodedNameJsonTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Serialization/EncodedName/Json/EncodedNameJsonTests.cs index 4d73d69bd96..6efa16e6a50 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Serialization/EncodedName/Json/EncodedNameJsonTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Serialization/EncodedName/Json/EncodedNameJsonTests.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using NUnit.Framework; -using Serialization.EncodedName.Json.Models; using Serialization.EncodedName.Json; +using Serialization.EncodedName.Json._Property; namespace TestProjects.CadlRanch.Tests.Http.Serialization.EncodedName.Json { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs index c3d831094ab..5fec9532e09 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/SpecialWords/SpecialWordsTests.Models.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License. using System.Threading.Tasks; -using NUnit.Framework; using SpecialWords; -using SpecialWords.Models; -using SpecialWordsAssert = SpecialWords.Models.Assert; -using SpecialWordsIs = SpecialWords.Models.Is; +using SpecialWords._ModelProperties; +using SpecialWords._Models; +using SpecialWordsAssert = SpecialWords._Models.Assert; +using SpecialWordsIs = SpecialWords._Models.Is; namespace TestProjects.CadlRanch.Tests.Http.SpecialWords { @@ -15,7 +15,7 @@ public partial class SpecialWordsTests : CadlRanchTestBase [CadlRanchTest] public Task ModelsWithAndAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithAndAsync(new And("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -23,7 +23,7 @@ public Task ModelsWithAndAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithAsAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithAsAsync(new As("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -31,7 +31,7 @@ public Task ModelsWithAsAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithAssertAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithAssertAsync(new SpecialWordsAssert("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -39,7 +39,7 @@ public Task ModelsWithAssertAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithAsyncAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithAsyncAsync(new Async("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -47,7 +47,7 @@ public Task ModelsWithAsyncAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithAwaitAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithAwaitAsync(new Await("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -55,7 +55,7 @@ public Task ModelsWithAwaitAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithBreakAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithBreakAsync(new Break("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -63,7 +63,7 @@ public Task ModelsWithBreakAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithClassAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithClassAsync(new Class("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -71,7 +71,7 @@ public Task ModelsWithClassAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithConstructorAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithConstructorAsync(new Constructor("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -79,7 +79,7 @@ public Task ModelsWithConstructorAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithContinueAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithContinueAsync(new Continue("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -87,7 +87,7 @@ public Task ModelsWithContinueAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithDefAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithDefAsync(new Def("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -95,7 +95,7 @@ public Task ModelsWithDefAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithDelAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithDelAsync(new Del("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -103,7 +103,7 @@ public Task ModelsWithDelAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithElifAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithElifAsync(new Elif("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -111,7 +111,7 @@ public Task ModelsWithElifAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithElseAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithElseAsync(new Else("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -119,7 +119,7 @@ public Task ModelsWithElseAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithExceptAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithExceptAsync(new Except("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -127,7 +127,7 @@ public Task ModelsWithExceptAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithExecAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithExecAsync(new Exec("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -135,7 +135,7 @@ public Task ModelsWithExecAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithFinallyAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithFinallyAsync(new Finally("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -143,7 +143,7 @@ public Task ModelsWithFinallyAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithFromAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithFromAsync(new From("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -151,7 +151,7 @@ public Task ModelsWithFromAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithGlobalAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithGlobalAsync(new Global("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -159,7 +159,7 @@ public Task ModelsWithGlobalAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithImportAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithImportAsync(new Import("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -167,7 +167,7 @@ public Task ModelsWithImportAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithInAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithInAsync(new In("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -175,7 +175,7 @@ public Task ModelsWithInAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithIsAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithIsAsync(new SpecialWordsIs("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -183,7 +183,7 @@ public Task ModelsWithIsAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithLambdaAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithLambdaAsync(new Lambda("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -191,7 +191,7 @@ public Task ModelsWithLambdaAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithNotAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithNotAsync(new Not("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -200,7 +200,7 @@ public Task ModelsWithNotAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithOrAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithOrAsync(new Or("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -208,7 +208,7 @@ public Task ModelsWithOrAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithPassAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithPassAsync(new Pass("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -216,7 +216,7 @@ public Task ModelsWithPassAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithRaiseAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithRaiseAsync(new Raise("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -224,7 +224,7 @@ public Task ModelsWithRaiseAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithReturnAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithReturnAsync(new Return("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -232,7 +232,7 @@ public Task ModelsWithReturnAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithTryAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithTryAsync(new Try("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -240,7 +240,7 @@ public Task ModelsWithTryAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithIfAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithIfAsync(new If("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -248,7 +248,7 @@ public Task ModelsWithIfAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithForAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithForAsync(new For("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -256,7 +256,7 @@ public Task ModelsWithForAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithWithAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithWithAsync(new With("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -264,7 +264,7 @@ public Task ModelsWithWithAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithWhileAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithWhileAsync(new While("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); @@ -272,7 +272,7 @@ public Task ModelsWithWhileAsync() => Test(async (host) => [CadlRanchTest] public Task ModelsWithYieldAsync() => Test(async (host) => { - var client = new SpecialWordsClient(host, null).GetModelsOpsClient(); + var client = new SpecialWordsClient(host, null).GetModelsClient(); var response = await client.WithYieldAsync(new Yield("ok")); NUnit.Framework.Assert.AreEqual(204, response.GetRawResponse().Status); }); diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V1/VersioningAddedV1Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V1/VersioningAddedV1Tests.cs index 90270620e3d..1d34a24390d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V1/VersioningAddedV1Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V1/VersioningAddedV1Tests.cs @@ -6,8 +6,7 @@ using System; using System.Linq; using NUnit.Framework; -using VersioningAddedV1::Versioning.Added.V1; -using VersioningAddedV1::Versioning.Added.V1.Models; +using VersioningAddedV1::Versioning.Added; namespace TestProjects.CadlRanch.Tests.Http.Versioning.Added.V1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V2/VersioningAddedV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V2/VersioningAddedV2Tests.cs index c7408f86c19..f480c2d8f56 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V2/VersioningAddedV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Added/V2/VersioningAddedV2Tests.cs @@ -7,8 +7,7 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using VersioningAddedV2::Versioning.Added.V2; -using VersioningAddedV2::Versioning.Added.V2.Models; +using VersioningAddedV2::Versioning.Added; namespace TestProjects.CadlRanch.Tests.Http.Versioning.Added.V2 { @@ -33,11 +32,11 @@ public void TestAddedMembersV2Client() Assert.IsTrue(enumValues.Contains("EnumMemberV2")); /* check existence of the added model ModelV2. */ - var modelV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.V2.Models.ModelV2"); + var modelV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.ModelV2"); Assert.IsNotNull(modelV2Type); /* check existence of the added enum EnumV2. */ - var enumV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.V2.Models.EnumV2"); + var enumV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.EnumV2"); Assert.IsNotNull(enumV2Type); /* check the added parameter. */ @@ -56,7 +55,7 @@ public void TestAddedMembersV2Client() Assert.AreEqual(4, addedMethods.Count()); /* check the existence of added interface in V2. */ - var interfaceV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.V2.InterfaceV2"); + var interfaceV2Type = typeof(ModelV1).Assembly.GetType("Versioning.Added.InterfaceV2"); Assert.IsNotNull(interfaceV2Type); } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V1/VersioningMadeOptionalV1Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V1/VersioningMadeOptionalV1Tests.cs index 2f60e934005..52a73279e10 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V1/VersioningMadeOptionalV1Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V1/VersioningMadeOptionalV1Tests.cs @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; +extern alias MadeOptionalV1; + using System.Linq; -using Versioning.MadeOptional.V1.Models; +using MadeOptionalV1::Versioning.MadeOptional; +using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Versioning.MadeOptional.V1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V2/VersioningMadeOptionalV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V2/VersioningMadeOptionalV2Tests.cs index 239b07fcd10..14ff8dcf920 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V2/VersioningMadeOptionalV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/MadeOptional/V2/VersioningMadeOptionalV2Tests.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; +extern alias MadeOptionalV2; using System.Linq; using System.Threading.Tasks; -using Versioning.MadeOptional.V2; -using Versioning.MadeOptional.V2.Models; +using MadeOptionalV2::Versioning.MadeOptional; +using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http.Versioning.MadeOptional.V2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V1/VersioningRemovedV1Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V1/VersioningRemovedV1Tests.cs index fb0b4939aaa..21e1538ed7b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V1/VersioningRemovedV1Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V1/VersioningRemovedV1Tests.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias RemovedV1; using System; using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Versioning.Removed.V1; -using Versioning.Removed.V1.Models; +using RemovedV1::Versioning.Removed; namespace TestProjects.CadlRanch.Tests.Http.Versioning.Removed.V1 { @@ -17,11 +17,11 @@ public void TestRemovedMembers() { var assembly = typeof(RemovedClient).Assembly; /* check existence of the removed model ModelV1. */ - var modelV1Type = assembly.GetType("Versioning.Removed.V1.Models.ModelV1"); + var modelV1Type = assembly.GetType("Versioning.Removed.ModelV1"); Assert.IsNotNull(modelV1Type); /* check existence of the removed enum EnumV1. */ - var enumV1Type = assembly.GetType("Versioning.Removed.V1.Models.EnumV1"); + var enumV1Type = assembly.GetType("Versioning.Removed.EnumV1"); Assert.IsNotNull(enumV1Type); /* check existence of removed method V1 */ @@ -38,7 +38,7 @@ public void TestRemovedMembers() } /* check existence of removed interface. */ - var interfaceV1Type = assembly.GetType("Versioning.Removed.V1.InterfaceV1"); + var interfaceV1Type = assembly.GetType("Versioning.Removed.InterfaceV1"); Assert.IsNotNull(interfaceV1Type); // Only initial versions is defined diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2/VersioningRemovedV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2/VersioningRemovedV2Tests.cs index 49b6031e46c..1f301d191de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2/VersioningRemovedV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2/VersioningRemovedV2Tests.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias RemovedV2; using System; using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Versioning.Removed.V2; -using Versioning.Removed.V2.Models; +using RemovedV2::Versioning.Removed; namespace TestProjects.CadlRanch.Tests.Http.Versioning.Removed.V2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2Preview/VersioningRemovedV2PreviewTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2Preview/VersioningRemovedV2PreviewTests.cs index 21b0b1ede60..84f904a5f0a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2Preview/VersioningRemovedV2PreviewTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/Removed/V2Preview/VersioningRemovedV2PreviewTests.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias RemovedV2Preview; using System.Threading.Tasks; using NUnit.Framework; -using Versioning.Removed.V2Preview; -using Versioning.Removed.V2Preview.Models; +using RemovedV2Preview::Versioning.Removed; namespace TestProjects.CadlRanch.Tests.Http.Versioning.Removed.V2Preview { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/RenamedFrom/V2/VersioningRenamedFromV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/RenamedFrom/V2/VersioningRenamedFromV2Tests.cs index 781364e03e5..8eaf817aa4c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/RenamedFrom/V2/VersioningRenamedFromV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/RenamedFrom/V2/VersioningRenamedFromV2Tests.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; +extern alias RenamedFromV2; using System; using System.Linq; using System.Threading.Tasks; -using Versioning.RenamedFrom.V2; -using Versioning.RenamedFrom.V2.Models; +using NUnit.Framework; +using RenamedFromV2::Versioning.RenamedFrom; namespace TestProjects.CadlRanch.Tests.Http.Versioning.RenamedFrom.V2 { @@ -17,9 +17,9 @@ public void TestRenamedMembers() { var assembly = typeof(RenamedFromClient).Assembly; /* check the renamed model from `OldModel` to `NewModel` */ - var oldModel = assembly.GetType("Versioning.RenamedFrom.V2.Models.OldModel"); + var oldModel = assembly.GetType("Versioning.RenamedFrom.OldModel"); Assert.IsNull(oldModel); - var newModel = assembly.GetType("Versioning.RenamedFrom.V2.Models.NewModel"); + var newModel = assembly.GetType("Versioning.RenamedFrom.NewModel"); Assert.IsNotNull(newModel); /* check the renamed property of model */ @@ -30,9 +30,9 @@ public void TestRenamedMembers() Assert.IsNotNull(typeof(NewModel).GetProperty("NewProp")); /* check the renamed enum from `OldEnum` to `NewEnum` */ - var oldEnum = assembly.GetType("Versioning.RenamedFrom.V2.Models.OldEnum"); + var oldEnum = assembly.GetType("Versioning.RenamedFrom.OldEnum"); Assert.IsNull(oldEnum); - var newEnum = assembly.GetType("Versioning.RenamedFrom.V2.Models.NewEnum"); + var newEnum = assembly.GetType("Versioning.RenamedFrom.NewEnum"); Assert.IsNotNull(newEnum); /* check the renamed enum value */ @@ -49,9 +49,9 @@ public void TestRenamedMembers() Assert.AreEqual(4, newMethods.Count()); /* check the renamed interface */ - var oldInterface = assembly.GetType("Versioning.RenamedFrom.V2.OldInterface"); + var oldInterface = assembly.GetType("Versioning.RenamedFrom.OldInterface"); Assert.IsNull(oldInterface); - var newInterface = assembly.GetType("Versioning.RenamedFrom.V2.NewInterface"); + var newInterface = assembly.GetType("Versioning.RenamedFrom.NewInterface"); Assert.IsNotNull(newInterface); } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs index 01a077d443d..c7f3cd8e80a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +extern alias ReturnTypeChangedFromV2; using System.Threading.Tasks; using NUnit.Framework; -using Versioning.ReturnTypeChangedFrom.V2; +using ReturnTypeChangedFromV2::Versioning.ReturnTypeChangedFrom; namespace TestProjects.CadlRanch.Tests.Http.Versioning.ReturnTypeChangedFrom.V2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/TypeChangedFrom/V2/VersioningTypeChangedFromV2Tests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/TypeChangedFrom/V2/VersioningTypeChangedFromV2Tests.cs index aa25c3194f2..5d9e172e38c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/TypeChangedFrom/V2/VersioningTypeChangedFromV2Tests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Versioning/TypeChangedFrom/V2/VersioningTypeChangedFromV2Tests.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using NUnit.Framework; +extern alias TypeChangedFromV2; using System.Threading.Tasks; -using Versioning.TypeChangedFrom.V2; -using Versioning.TypeChangedFrom.V2.Models; +using NUnit.Framework; +using TypeChangedFromV2::Versioning.TypeChangedFrom; namespace TestProjects.CadlRanch.Tests.Http.Versioning.TypeChangedFrom.V2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Dictionary/DictionaryTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Dictionary/DictionaryTests.cs index 75961288962..be1a4c9bd13 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Dictionary/DictionaryTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Dictionary/DictionaryTests.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using System.Xml; using _Type.Dictionary; -using _Type.Dictionary.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Dictionary diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Empty/EmptyTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Empty/EmptyTests.cs index 0d733158f51..a34f8d6bb9c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Empty/EmptyTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Empty/EmptyTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using _Type.Model.Empty; -using _Type.Model.Empty.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Empty diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/EnumDiscriminator/EnumDiscriminatorTest.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/EnumDiscriminator/EnumDiscriminatorTest.cs index 4c69f8b14f0..0fa7f9ea872 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/EnumDiscriminator/EnumDiscriminatorTest.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/EnumDiscriminator/EnumDiscriminatorTest.cs @@ -3,10 +3,8 @@ using System; using System.Linq; -using System.Reflection; using System.Threading.Tasks; using _Type.Model.Inheritance.EnumDiscriminator; -using _Type.Model.Inheritance.EnumDiscriminator.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Inheritance.EnumDiscriminator diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NestedDiscriminator/NestedDiscriminatorTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NestedDiscriminator/NestedDiscriminatorTests.cs index c0e04425b8f..65de9f207ac 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NestedDiscriminator/NestedDiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NestedDiscriminator/NestedDiscriminatorTests.cs @@ -5,7 +5,6 @@ using System.Reflection; using System.Threading.Tasks; using _Type.Model.Inheritance.NestedDiscriminator; -using _Type.Model.Inheritance.NestedDiscriminator.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Inheritance.NestedDiscriminator diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NotDiscriminated/NotDiscriminatedTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NotDiscriminated/NotDiscriminatedTests.cs index 48e0409ec24..caa317618bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NotDiscriminated/NotDiscriminatedTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/NotDiscriminated/NotDiscriminatedTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using _Type.Model.Inheritance.NotDiscriminated; -using _Type.Model.Inheritance.NotDiscriminated.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Inheritance.NotDiscriminated diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/Recursive/RecursiveTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/Recursive/RecursiveTests.cs index 369e9acbfed..6760ea3d044 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/Recursive/RecursiveTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/Recursive/RecursiveTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using _Type.Model.Inheritance.Recursive; -using _Type.Model.Inheritance.Recursive.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Inheritance.Recursive diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/EagleTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/EagleTests.cs index 7f0c3cd98b5..11a5b62c9df 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/EagleTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/EagleTests.cs @@ -3,7 +3,7 @@ using System.ClientModel; using System.IO; -using _Type.Model.Inheritance.SingleDiscriminator.Models; +using _Type.Model.Inheritance.SingleDiscriminator; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; using TestProjects.CadlRanch.Tests.Infrastructure; diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/SingleDiscriminatorTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/SingleDiscriminatorTests.cs index 2f075a9de08..1e3e626e630 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/SingleDiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Inheritance/SingleDiscriminator/SingleDiscriminatorTests.cs @@ -4,7 +4,6 @@ using System.Reflection; using System.Threading.Tasks; using _Type.Model.Inheritance.SingleDiscriminator; -using _Type.Model.Inheritance.SingleDiscriminator.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Inheritance.SingleDiscriminator @@ -70,7 +69,8 @@ public Task GetMissingDiscriminator() => Test(async (host) => var result = await new SingleDiscriminatorClient(host, null).GetMissingDiscriminatorAsync(); Assert.IsTrue(result.Value is Bird); - var unknownBirdType = typeof(Bird).Assembly.GetType("_Type.Model.Inheritance.SingleDiscriminator.Models.UnknownBird"); + var unknownBirdType = typeof(Bird).Assembly.GetType("_Type.Model.Inheritance.SingleDiscriminator.UnknownBird"); + Assert.IsNotNull(unknownBirdType); Assert.AreEqual(unknownBirdType, result.Value.GetType()); Assert.AreEqual(1, result.Value.Wingspan); @@ -84,7 +84,8 @@ public Task GetWrongDiscriminator() => Test(async (host) => var result = await new SingleDiscriminatorClient(host, null).GetWrongDiscriminatorAsync(); Assert.IsTrue(result.Value is Bird); - var unknownBirdType = typeof(Bird).Assembly.GetType("_Type.Model.Inheritance.SingleDiscriminator.Models.UnknownBird"); + var unknownBirdType = typeof(Bird).Assembly.GetType("_Type.Model.Inheritance.SingleDiscriminator.UnknownBird"); + Assert.IsNotNull(unknownBirdType); Assert.AreEqual(unknownBirdType, result.Value.GetType()); Assert.AreEqual(1, result.Value.Wingspan); diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Usage/UsageTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Usage/UsageTests.cs index 440dd26758e..1c416e01628 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Usage/UsageTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Usage/UsageTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using _Type.Model.Usage; -using _Type.Model.Usage.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Usage diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Visibility/VisibilityTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Visibility/VisibilityTests.cs index 14e629ee6e1..e9653e123e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Visibility/VisibilityTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Model/Visibility/VisibilityTests.cs @@ -8,7 +8,6 @@ using System.Reflection; using System.Threading.Tasks; using _Type.Model.Visibility; -using _Type.Model.Visibility.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Model.Visibility diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs index 13ccf4bc04d..086402c2c5e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/AdditionalPropertiesTests.cs @@ -2,15 +2,14 @@ // Licensed under the MIT License. -using NUnit.Framework; using System; using System.ClientModel.Primitives; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; using _Type.Property.AdditionalProperties; -using System.Reflection; +using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/DifferentSpreadStringDerivedTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/DifferentSpreadStringDerivedTests.cs index 94c570f854f..4aecd0785ca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/DifferentSpreadStringDerivedTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/DifferentSpreadStringDerivedTests.cs @@ -3,7 +3,7 @@ using System.ClientModel; using System.IO; -using _Type.Property.AdditionalProperties.Models; +using _Type.Property.AdditionalProperties; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; using TestProjects.CadlRanch.Tests.Infrastructure; diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/MultipleSpreadRecordTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/MultipleSpreadRecordTests.cs index d90ec87c10c..66365ea9e18 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/MultipleSpreadRecordTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/AdditionalProperties/MultipleSpreadRecordTests.cs @@ -3,7 +3,7 @@ using System.ClientModel; using System.IO; -using _Type.Property.AdditionalProperties.Models; +using _Type.Property.AdditionalProperties; using Microsoft.Generator.CSharp.Tests.Common; using NUnit.Framework; using TestProjects.CadlRanch.Tests.Infrastructure; diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/Optionality/OptionalityTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/Optionality/OptionalityTests.cs index 6c0b8996155..971f69dd717 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/Optionality/OptionalityTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/Optionality/OptionalityTests.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using System.Xml; using _Type.Property.Optional; -using _Type.Property.Optional.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Property.Optionality diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/ValueTypes/ValueTypesTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/ValueTypes/ValueTypesTests.cs index 7d9a01c68e0..def8c99e2ec 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/ValueTypes/ValueTypesTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Property/ValueTypes/ValueTypesTests.cs @@ -1,14 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System.Threading.Tasks; -using NUnit.Framework; using System; -using System.Xml; -using _Type.Property.ValueTypes; -using _Type.Property.ValueTypes.Models; using System.Collections.Generic; using System.Text.Json; +using System.Threading.Tasks; +using System.Xml; +using _Type.Property.ValueTypes; +using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Union/UnionTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Union/UnionTests.cs index 1f5e18da61e..55d7d56a468 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Union/UnionTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/Union/UnionTests.cs @@ -4,11 +4,8 @@ using System; using System.ClientModel.Primitives; using System.Collections.Generic; -using System.Diagnostics; -using System.Reflection; using System.Threading.Tasks; using _Type.Union; -using _Type.Union.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type.Union diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/ArrayTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/ArrayTests.cs index fcd02e4fd95..9b67dacfbd9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/ArrayTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Array/ArrayTests.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using System.Xml; using _Type._Array; -using _Type._Array.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type._Array diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/ExtensibleTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/ExtensibleTests.cs index eb02a162897..e333825b4ef 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/ExtensibleTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Extensible/ExtensibleTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using _Type._Enum.Extensible; -using _Type._Enum.Extensible.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type._Enum.Extensible diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/FixedTests.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/FixedTests.cs index 0feca09ff1c..5f7ab66d068 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/FixedTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/_Type/_Enum/Fixed/FixedTests.cs @@ -5,7 +5,6 @@ using System.ClientModel; using System.Threading.Tasks; using _Type._Enum.Fixed; -using _Type._Enum.Fixed.Models; using NUnit.Framework; namespace TestProjects.CadlRanch.Tests.Http._Type._Enum.Fixed diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj index bf66de5a561..dd25c024dbd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj @@ -15,18 +15,19 @@ - - + + + - - - - - - + + + + + + @@ -39,8 +40,8 @@ - - + + @@ -51,35 +52,34 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a8816e55cbf --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Authentication.ApiKey +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..62f518ba2d9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Authentication.ApiKey +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..370b22b2876 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Authentication.ApiKey +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..29da4de6890 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Authentication.ApiKey +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json index f8b4bec5e08..4c9ab31f491 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InvalidAuth", + "clientNamespace": "Authentication.ApiKey", "crossLanguageDefinitionId": "Authentication.ApiKey.InvalidAuth", "usage": "Error,Json,Exception", "decorators": [], @@ -45,6 +46,7 @@ { "$id": "7", "Name": "ApiKeyClient", + "ClientNamespace": "Authentication.ApiKey", "Doc": "Illustrates clients generated with ApiKey authentication.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..43ffda7d8f7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Http.Custom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ff51a41e011 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Http.Custom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..e3661cac1ac --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Http.Custom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..c41ba36b705 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Http.Custom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json index df987b1fea5..1484f57a9c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InvalidAuth", + "clientNamespace": "Authentication.Http.Custom", "crossLanguageDefinitionId": "Authentication.Http.Custom.InvalidAuth", "usage": "Error,Json,Exception", "decorators": [], @@ -45,6 +46,7 @@ { "$id": "7", "Name": "CustomClient", + "ClientNamespace": "Authentication.Http.Custom", "Doc": "Illustrates clients generated with generic HTTP auth.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..22ffc3cd29e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Authentication.OAuth2 +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..4d0ea13bae9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Authentication.OAuth2 +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0627fb25ad9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Authentication.OAuth2 +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f6b62c00b6a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Authentication.OAuth2 +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json index 60a785f3f17..881d4962698 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InvalidAuth", + "clientNamespace": "Authentication.OAuth2", "crossLanguageDefinitionId": "Authentication.OAuth2.InvalidAuth", "usage": "Error,Json,Exception", "decorators": [], @@ -45,6 +46,7 @@ { "$id": "7", "Name": "OAuth2Client", + "ClientNamespace": "Authentication.OAuth2", "Doc": "Illustrates clients generated with OAuth2 authentication.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..78baeb19cc5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Union +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..297eebb7fa0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..c3b4172dc01 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..06591eee355 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Authentication.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json index 354f11d3bf6..2224a7c8e44 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "UnionClient", + "ClientNamespace": "Authentication.Union", "Doc": "Illustrates clients generated with ApiKey and OAuth2 authentication.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientModel.cs deleted file mode 100644 index b5d5c4f04dd..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientModel.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; -using Client.Naming.Models; - -namespace Client.Naming -{ - public partial class ClientModel - { - protected ClientModel() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult Client(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task ClientAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Client(Models.ClientModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task ClientAsync(Models.ClientModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Language(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task LanguageAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Language(CSModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task LanguageAsync(CSModel body, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientNamingModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientNamingModelFactory.cs deleted file mode 100644 index a18789aad5b..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/ClientNamingModelFactory.cs +++ /dev/null @@ -1,19 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public static partial class ClientNamingModelFactory - { - public static ClientNameModel ClientNameModel(bool clientName = default) => throw null; - - public static LanguageClientNameModel LanguageClientNameModel(bool csName = default) => throw null; - - public static ClientNameAndJsonEncodedNameModel ClientNameAndJsonEncodedNameModel(bool clientName = default) => throw null; - - public static ClientModel ClientModel(bool defaultName = default) => throw null; - - public static CSModel CSModel(bool defaultName = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.Serialization.cs deleted file mode 100644 index 3a7c8291052..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace Client.Naming.Models -{ - public partial class CSModel : IJsonModel - { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - CSModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual CSModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - CSModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual CSModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static implicit operator BinaryContent(CSModel csModel) => throw null; - - public static explicit operator CSModel(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.cs deleted file mode 100644 index 9a7c2296e52..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/CSModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public partial class CSModel - { - public CSModel(bool defaultName) => throw null; - - public bool DefaultName => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientExtensibleEnum.cs deleted file mode 100644 index fc180454ac7..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientExtensibleEnum.cs +++ /dev/null @@ -1,32 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; - -namespace Client.Naming.Models -{ - public readonly partial struct ClientExtensibleEnum : IEquatable - { - public ClientExtensibleEnum(string value) => throw null; - - public static ClientExtensibleEnum EnumValue1 => throw null; - - public static bool operator ==(ClientExtensibleEnum left, ClientExtensibleEnum right) => throw null; - - public static bool operator !=(ClientExtensibleEnum left, ClientExtensibleEnum right) => throw null; - - public static implicit operator ClientExtensibleEnum(string value) => throw null; - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => throw null; - - public bool Equals(ClientExtensibleEnum other) => throw null; - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => throw null; - - public override string ToString() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.Serialization.cs deleted file mode 100644 index 82c8e506237..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace Client.Naming.Models -{ - public partial class ClientModel : IJsonModel - { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ClientModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - ClientModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static implicit operator BinaryContent(ClientModel clientModel) => throw null; - - public static explicit operator ClientModel(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.cs deleted file mode 100644 index 217443a503d..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public partial class ClientModel - { - public ClientModel(bool defaultName) => throw null; - - public bool DefaultName => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.Serialization.cs deleted file mode 100644 index d0558fa383c..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace Client.Naming.Models -{ - public partial class ClientNameAndJsonEncodedNameModel : IJsonModel - { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ClientNameAndJsonEncodedNameModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientNameAndJsonEncodedNameModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - ClientNameAndJsonEncodedNameModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientNameAndJsonEncodedNameModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static implicit operator BinaryContent(ClientNameAndJsonEncodedNameModel clientNameAndJsonEncodedNameModel) => throw null; - - public static explicit operator ClientNameAndJsonEncodedNameModel(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.cs deleted file mode 100644 index 11e7e41da64..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameAndJsonEncodedNameModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public partial class ClientNameAndJsonEncodedNameModel - { - public ClientNameAndJsonEncodedNameModel(bool clientName) => throw null; - - public bool ClientName => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.Serialization.cs deleted file mode 100644 index 7cc7e258fdd..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace Client.Naming.Models -{ - public partial class ClientNameModel : IJsonModel - { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - ClientNameModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientNameModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - ClientNameModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual ClientNameModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static implicit operator BinaryContent(ClientNameModel clientNameModel) => throw null; - - public static explicit operator ClientNameModel(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.cs deleted file mode 100644 index 621dcbe9f0d..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ClientNameModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public partial class ClientNameModel - { - public ClientNameModel(bool clientName) => throw null; - - public bool ClientName => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ExtensibleEnum.cs deleted file mode 100644 index f6d471f08d5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/ExtensibleEnum.cs +++ /dev/null @@ -1,34 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; - -namespace Client.Naming.Models -{ - public readonly partial struct ExtensibleEnum : IEquatable - { - public ExtensibleEnum(string value) => throw null; - - public static ExtensibleEnum ClientEnumValue1 => throw null; - - public static ExtensibleEnum ClientEnumValue2 => throw null; - - public static bool operator ==(ExtensibleEnum left, ExtensibleEnum right) => throw null; - - public static bool operator !=(ExtensibleEnum left, ExtensibleEnum right) => throw null; - - public static implicit operator ExtensibleEnum(string value) => throw null; - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => throw null; - - public bool Equals(ExtensibleEnum other) => throw null; - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => throw null; - - public override string ToString() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.Serialization.cs deleted file mode 100644 index 8da7567bf79..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.Serialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Text.Json; - -namespace Client.Naming.Models -{ - public partial class LanguageClientNameModel : IJsonModel - { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) => throw null; - - LanguageClientNameModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - protected virtual LanguageClientNameModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => throw null; - - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => throw null; - - protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) => throw null; - - LanguageClientNameModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => throw null; - - protected virtual LanguageClientNameModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) => throw null; - - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => throw null; - - public static implicit operator BinaryContent(LanguageClientNameModel languageClientNameModel) => throw null; - - public static explicit operator LanguageClientNameModel(ClientResult result) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.cs deleted file mode 100644 index b99f7e10bcf..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/Models/LanguageClientNameModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -// - -#nullable disable - -namespace Client.Naming.Models -{ - public partial class LanguageClientNameModel - { - public LanguageClientNameModel(bool csName) => throw null; - - public bool CSName => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClient.cs deleted file mode 100644 index aa6429d1ebc..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClient.cs +++ /dev/null @@ -1,82 +0,0 @@ -// - -#nullable disable - -using System; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; -using Client.Naming.Models; - -namespace Client.Naming -{ - public partial class NamingClient - { - public NamingClient() : this(new Uri("http://localhost:3000"), new NamingClientOptions()) => throw null; - - public NamingClient(Uri endpoint, NamingClientOptions options) => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult ClientName(RequestOptions options) => throw null; - - public virtual Task ClientNameAsync(RequestOptions options) => throw null; - - public virtual ClientResult ClientName(CancellationToken cancellationToken = default) => throw null; - - public virtual Task ClientNameAsync(CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Parameter(string clientName, RequestOptions options) => throw null; - - public virtual Task ParameterAsync(string clientName, RequestOptions options) => throw null; - - public virtual ClientResult Parameter(string clientName, CancellationToken cancellationToken = default) => throw null; - - public virtual Task ParameterAsync(string clientName, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Client(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task ClientAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Client(ClientNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task ClientAsync(ClientNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Language(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task LanguageAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult Language(LanguageClientNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task LanguageAsync(LanguageClientNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult CompatibleWithEncodedName(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task CompatibleWithEncodedNameAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult CompatibleWithEncodedName(ClientNameAndJsonEncodedNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task CompatibleWithEncodedNameAsync(ClientNameAndJsonEncodedNameModel body, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Request(string clientName, RequestOptions options) => throw null; - - public virtual Task RequestAsync(string clientName, RequestOptions options) => throw null; - - public virtual ClientResult Request(string clientName, CancellationToken cancellationToken = default) => throw null; - - public virtual Task RequestAsync(string clientName, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult Response(RequestOptions options) => throw null; - - public virtual Task ResponseAsync(RequestOptions options) => throw null; - - public virtual ClientResult Response(CancellationToken cancellationToken = default) => throw null; - - public virtual Task ResponseAsync(CancellationToken cancellationToken = default) => throw null; - - public virtual ClientModel GetClientModelClient() => throw null; - - public virtual UnionEnum GetUnionEnumClient() => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClientOptions.cs deleted file mode 100644 index aab8bfd2f2e..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/NamingClientOptions.cs +++ /dev/null @@ -1,12 +0,0 @@ -// - -#nullable disable - -using System.ClientModel.Primitives; - -namespace Client.Naming -{ - public partial class NamingClientOptions : ClientPipelineOptions - { - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/UnionEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/UnionEnum.cs deleted file mode 100644 index b0e48fa29eb..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Generated/UnionEnum.cs +++ /dev/null @@ -1,35 +0,0 @@ -// - -#nullable disable - -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Threading; -using System.Threading.Tasks; -using Client.Naming.Models; - -namespace Client.Naming -{ - public partial class UnionEnum - { - protected UnionEnum() => throw null; - - public ClientPipeline Pipeline => throw null; - - public virtual ClientResult UnionEnumName(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task UnionEnumNameAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult UnionEnumName(ClientExtensibleEnum body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task UnionEnumNameAsync(ClientExtensibleEnum body, CancellationToken cancellationToken = default) => throw null; - - public virtual ClientResult UnionEnumMemberName(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual Task UnionEnumMemberNameAsync(BinaryContent content, RequestOptions options = null) => throw null; - - public virtual ClientResult UnionEnumMemberName(ExtensibleEnum body, CancellationToken cancellationToken = default) => throw null; - - public virtual Task UnionEnumMemberNameAsync(ExtensibleEnum body, CancellationToken cancellationToken = default) => throw null; - } -} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/FirstClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/FirstClient.cs index bb665718243..09efa090360 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/FirstClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/FirstClient.cs @@ -7,9 +7,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Models; +using Client.Structure.Service; -namespace Client.Structure.Service +namespace Client.Structure.ClientOperationGroup { public partial class FirstClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group3.cs index 56cf60ebb2d..36f592b901d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group3.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service +namespace Client.Structure.ClientOperationGroup { public partial class Group3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group4.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group4.cs index a1a8d231b06..5470b3bbc52 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group4.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group4.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service +namespace Client.Structure.ClientOperationGroup { public partial class Group4 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group5.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group5.cs index e4a9b205941..eb10cff56a7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group5.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Group5.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service +namespace Client.Structure.AnotherClientOperationGroup { public partial class Group5 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bbbfc64a250 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ecd65c71a36 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6575c5cb08f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f5ab9937d72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Models/ClientType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Models/ClientType.cs index 6cb5138ad13..e9c17b0dd1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Models/ClientType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/Models/ClientType.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Client.Structure.Service.Models +namespace Client.Structure.Service { public enum ClientType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs index 4277bf32747..9fe43ebbd7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/src/Generated/SubNamespaceSecondClient.cs @@ -7,9 +7,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Models; +using Client.Structure.Service; -namespace Client.Structure.Service +namespace Client.Structure.AnotherClientOperationGroup { public partial class SubNamespaceSecondClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json index 84895c53c2e..190328726a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json @@ -102,6 +102,7 @@ "decorators": [] } ], + "clientNamespace": "Client.Structure.Service", "isFixed": true, "isFlags": false, "usage": "Input", @@ -113,6 +114,7 @@ { "$id": "14", "Name": "FirstClient", + "ClientNamespace": "Client.Structure.ClientOperationGroup", "Operations": [ { "$id": "15", @@ -191,6 +193,7 @@ { "$id": "21", "Name": "Group3", + "ClientNamespace": "Client.Structure.ClientOperationGroup", "Operations": [ { "$id": "22", @@ -297,6 +300,7 @@ { "$id": "30", "Name": "Group4", + "ClientNamespace": "Client.Structure.ClientOperationGroup", "Operations": [ { "$id": "31", @@ -376,6 +380,7 @@ { "$id": "37", "Name": "SubNamespace.SecondClient", + "ClientNamespace": "Client.Structure.AnotherClientOperationGroup", "Operations": [ { "$id": "38", @@ -454,6 +459,7 @@ { "$id": "44", "Name": "Group5", + "ClientNamespace": "Client.Structure.AnotherClientOperationGroup", "Operations": [ { "$id": "45", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json index 53cca19ed7a..020d005bc20 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Client.Structure.Service.Default", + "namespace": "Client.Structure.Service", "library-name": "Client.Structure.Service.Default" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs index 3d7e5e78a39..b477c997e2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service { public partial class Bar { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs index 4ec6ac254c2..c13fd297ec5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service._Baz { public partial class Baz { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs index 5fb13b8acf2..6ed62d51d4e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service._Baz { public partial class BazFoo { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs index c3e9e97da54..4989e29298c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service { public partial class Foo { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bbbfc64a250 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ecd65c71a36 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6575c5cb08f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f5ab9937d72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs index aaa10224710..e9c17b0dd1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Client.Structure.Service.Default.Models +namespace Client.Structure.Service { public enum ClientType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs index 0f3f83ea367..e94b919e17f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service._Qux { public partial class Qux { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs index 90532bd46ad..1cf32f91487 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service._Qux { public partial class QuxBar { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs index fd72bc03a9d..c6745dfd7c9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs @@ -7,9 +7,10 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Default.Models; +using Client.Structure.Service._Baz; +using Client.Structure.Service._Qux; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service { public partial class ServiceClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs index 336b356b65c..721c8b6c398 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.Default +namespace Client.Structure.Service { public partial class ServiceClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json index a96d1861322..50b11724056 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json @@ -102,6 +102,7 @@ "decorators": [] } ], + "clientNamespace": "Client.Structure.Service", "isFixed": true, "isFlags": false, "usage": "Input", @@ -113,6 +114,7 @@ { "$id": "14", "Name": "ServiceClient", + "ClientNamespace": "Client.Structure.Service", "Doc": "Test that we can use @client and @operationGroup decorators to customize client side code structure, such as:\n1. have everything as default.\n2. to rename client or operation group\n3. one client can have more than one operations groups\n4. split one interface into two clients\n5. have two clients with operations come from different interfaces\n6. have two clients with a hierarchy relation.", "Operations": [ { @@ -219,6 +221,7 @@ { "$id": "23", "Name": "Baz", + "ClientNamespace": "Client.Structure.Service.Baz", "Operations": [], "Protocol": { "$id": "24" @@ -270,6 +273,7 @@ { "$id": "28", "Name": "BazFoo", + "ClientNamespace": "Client.Structure.Service.Baz", "Operations": [ { "$id": "29", @@ -349,6 +353,7 @@ { "$id": "35", "Name": "Qux", + "ClientNamespace": "Client.Structure.Service.Qux", "Operations": [ { "$id": "36", @@ -428,6 +433,7 @@ { "$id": "42", "Name": "QuxBar", + "ClientNamespace": "Client.Structure.Service.Qux", "Operations": [ { "$id": "43", @@ -507,6 +513,7 @@ { "$id": "49", "Name": "Foo", + "ClientNamespace": "Client.Structure.Service", "Operations": [ { "$id": "50", @@ -613,6 +620,7 @@ { "$id": "58", "Name": "Bar", + "ClientNamespace": "Client.Structure.Service", "Operations": [ { "$id": "59", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspconfig.yaml b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspconfig.yaml index 4063764a54a..b87edd04d23 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspconfig.yaml +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspconfig.yaml @@ -1,3 +1,3 @@ options: "@typespec/http-client-csharp": - namespace: Client.Structure.Service.Default + library-name: Client.Structure.Service.Default diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json index b9c41a379ad..a68dec17291 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Client.Structure.Service.Multi.Client", + "namespace": "Client.Structure.Service", "library-name": "Client.Structure.Service.Multi.Client" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClient.cs index d96274613ea..8474e633848 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClient.cs @@ -7,9 +7,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Multi.Client.Models; +using Client.Structure.Service; -namespace Client.Structure.Service.Multi.Client +namespace Client.Structure.MultiClient { public partial class ClientAClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs index b7503733bcb..7565c20dbcc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientAClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.Multi.Client +namespace Client.Structure.Service { public partial class ClientAClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClient.cs index b55365360c9..63271b0bf6f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClient.cs @@ -7,9 +7,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Multi.Client.Models; +using Client.Structure.Service; -namespace Client.Structure.Service.Multi.Client +namespace Client.Structure.MultiClient { public partial class ClientBClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs index 8178cfb3e47..6c17e4e7009 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/ClientBClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.Multi.Client +namespace Client.Structure.Service { public partial class ClientBClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bbbfc64a250 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ecd65c71a36 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6575c5cb08f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f5ab9937d72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Models/ClientType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Models/ClientType.cs index 227fdb3d79e..e9c17b0dd1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Models/ClientType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/src/Generated/Models/ClientType.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Client.Structure.Service.Multi.Client.Models +namespace Client.Structure.Service { public enum ClientType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json index 5cf7a1ba219..3a3211b7bd1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json @@ -102,6 +102,7 @@ "decorators": [] } ], + "clientNamespace": "Client.Structure.Service", "isFixed": true, "isFlags": false, "usage": "Input", @@ -113,6 +114,7 @@ { "$id": "14", "Name": "ClientAClient", + "ClientNamespace": "Client.Structure.MultiClient", "Operations": [ { "$id": "15", @@ -245,6 +247,7 @@ { "$id": "25", "Name": "ClientBClient", + "ClientNamespace": "Client.Structure.MultiClient", "Operations": [ { "$id": "26", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspconfig.yaml b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspconfig.yaml index daaf019aa72..0d574c72221 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspconfig.yaml +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspconfig.yaml @@ -1,3 +1,3 @@ options: "@typespec/http-client-csharp": - namespace: Client.Structure.Service.Multi.Client + library-name: Client.Structure.Service.Multi.Client diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json index 477f08c2f39..7793d1c816d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Client.Structure.Service.Renamed.Operation", + "namespace": "Client.Structure.Service", "library-name": "Client.Structure.Service.Renamed.Operation" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Group.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Group.cs index 8c951442424..43d04d3edb0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Group.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Group.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.Renamed.Operation +namespace Client.Structure.RenamedOperation { public partial class Group { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bbbfc64a250 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ecd65c71a36 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6575c5cb08f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f5ab9937d72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Models/ClientType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Models/ClientType.cs index f077d34f2f3..e9c17b0dd1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Models/ClientType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/Models/ClientType.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Client.Structure.Service.Renamed.Operation.Models +namespace Client.Structure.Service { public enum ClientType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs index 4d0ef0b4363..acb300be1b5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClient.cs @@ -7,9 +7,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Client.Structure.Service.Renamed.Operation.Models; +using Client.Structure.Service; -namespace Client.Structure.Service.Renamed.Operation +namespace Client.Structure.RenamedOperation { public partial class RenamedOperationClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs index 87acccd9492..c6875067722 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/src/Generated/RenamedOperationClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.Renamed.Operation +namespace Client.Structure.Service { public partial class RenamedOperationClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json index bf936109539..9b21b2779c9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json @@ -102,6 +102,7 @@ "decorators": [] } ], + "clientNamespace": "Client.Structure.Service", "isFixed": true, "isFlags": false, "usage": "Input", @@ -113,6 +114,7 @@ { "$id": "14", "Name": "RenamedOperationClient", + "ClientNamespace": "Client.Structure.RenamedOperation", "Operations": [ { "$id": "15", @@ -245,6 +247,7 @@ { "$id": "25", "Name": "Group", + "ClientNamespace": "Client.Structure.RenamedOperation", "Operations": [ { "$id": "26", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspconfig.yaml b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspconfig.yaml index e5950f98af3..1f0b1da8e07 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspconfig.yaml +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspconfig.yaml @@ -1,3 +1,3 @@ options: "@typespec/http-client-csharp": - namespace: Client.Structure.Service.Renamed.Operation + library-name: Client.Structure.Service.Renamed.Operation diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json index 35ea1ee694c..d8c73da2aa4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Client.Structure.Service.TwoOperationGroup", + "namespace": "Client.Structure.Service", "library-name": "Client.Structure.Service.TwoOperationGroup" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group1.cs index bdb742006fe..4657d169616 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group1.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.TwoOperationGroup +namespace Client.Structure.TwoOperationGroup { public partial class Group1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group2.cs index dc8ad43369d..783310627ed 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Group2.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Client.Structure.Service.TwoOperationGroup +namespace Client.Structure.TwoOperationGroup { public partial class Group2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bbbfc64a250 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ecd65c71a36 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6575c5cb08f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..f5ab9937d72 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Client.Structure.Service +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Models/ClientType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Models/ClientType.cs index b730e5d5560..e9c17b0dd1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Models/ClientType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/Models/ClientType.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Client.Structure.Service.TwoOperationGroup.Models +namespace Client.Structure.Service { public enum ClientType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs index f17b2859787..42cdaf6080a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClient.cs @@ -4,9 +4,9 @@ using System; using System.ClientModel.Primitives; -using Client.Structure.Service.TwoOperationGroup.Models; +using Client.Structure.Service; -namespace Client.Structure.Service.TwoOperationGroup +namespace Client.Structure.TwoOperationGroup { public partial class TwoOperationGroupClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs index be72d3a019e..b0b6042ce6c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/src/Generated/TwoOperationGroupClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Client.Structure.Service.TwoOperationGroup +namespace Client.Structure.Service { public partial class TwoOperationGroupClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspCodeModel.json index 3d6903520a5..1b81949afc0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspCodeModel.json @@ -102,6 +102,7 @@ "decorators": [] } ], + "clientNamespace": "Client.Structure.Service", "isFixed": true, "isFlags": false, "usage": "Input", @@ -113,6 +114,7 @@ { "$id": "14", "Name": "TwoOperationGroupClient", + "ClientNamespace": "Client.Structure.TwoOperationGroup", "Operations": [], "Protocol": { "$id": "15" @@ -163,6 +165,7 @@ { "$id": "19", "Name": "Group1", + "ClientNamespace": "Client.Structure.TwoOperationGroup", "Operations": [ { "$id": "20", @@ -296,6 +299,7 @@ { "$id": "30", "Name": "Group2", + "ClientNamespace": "Client.Structure.TwoOperationGroup", "Operations": [ { "$id": "31", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspconfig.yaml b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspconfig.yaml index 44c019d90ec..8ad65e1a2b5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspconfig.yaml +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/two-operation-group/tspconfig.yaml @@ -1,3 +1,3 @@ options: "@typespec/http-client-csharp": - namespace: Client.Structure.Service.TwoOperationGroup + library-name: Client.Structure.Service.TwoOperationGroup diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/BytesClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/BytesClient.cs index 01fb92d7830..9f869034eb7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/BytesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/BytesClient.cs @@ -4,6 +4,11 @@ using System; using System.ClientModel.Primitives; +using Encode.Bytes._Header; +using Encode.Bytes._Property; +using Encode.Bytes._Query; +using Encode.Bytes._RequestBody; +using Encode.Bytes._ResponseBody; namespace Encode.Bytes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/EncodeBytesModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/EncodeBytesModelFactory.cs index cf762919c73..1dc7001597e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/EncodeBytesModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/EncodeBytesModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public static partial class EncodeBytesModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Header.cs index c9b5ac5efb2..04f54e9db06 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Header.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Bytes +namespace Encode.Bytes._Header { public partial class Header { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..4608278b5bc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Encode.Bytes +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d4a327df309 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Encode.Bytes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..7a52785a9db --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Encode.Bytes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..d41045bc32a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Encode.Bytes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs index 84809c1a192..1df2b08da7b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64BytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.cs index c27ae96371b..6d0118a87c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64BytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64BytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs index f028da2e863..1ec8a7929b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64urlArrayBytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.cs index 8b3062e3898..f5677f0e1d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlArrayBytesProperty.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64urlArrayBytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs index f958dc53fb5..e36ac08366b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64urlBytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.cs index a3e9a4050f9..b30e7162a15 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/Base64urlBytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class Base64urlBytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs index f97a1ec1cb8..493072d9744 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class DefaultBytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.cs index 9d8e004dcb7..976f213dc37 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Models/DefaultBytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Bytes.Models +namespace Encode.Bytes { public partial class DefaultBytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Property.cs index 00a562ac6d1..cd447f162f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Property.cs @@ -6,9 +6,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Encode.Bytes.Models; +using Encode.Bytes; -namespace Encode.Bytes +namespace Encode.Bytes._Property { public partial class Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Query.cs index c0f522c51b6..e833cb0b334 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/Query.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Bytes +namespace Encode.Bytes._Query { public partial class Query { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/RequestBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/RequestBody.cs index b7898078b02..8f2b981bd11 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/RequestBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/RequestBody.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Bytes +namespace Encode.Bytes._RequestBody { public partial class RequestBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/ResponseBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/ResponseBody.cs index dd849dfa3ff..d61d52ae44f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/ResponseBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/src/Generated/ResponseBody.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Bytes +namespace Encode.Bytes._ResponseBody { public partial class ResponseBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/tspCodeModel.json index dfece5bbfda..7a39503ab8c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/bytes/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "DefaultBytesProperty", + "clientNamespace": "Encode.Bytes", "crossLanguageDefinitionId": "Encode.Bytes.DefaultBytesProperty", "usage": "Input,Output,Json", "decorators": [], @@ -45,6 +46,7 @@ "$id": "7", "kind": "model", "name": "Base64BytesProperty", + "clientNamespace": "Encode.Bytes", "crossLanguageDefinitionId": "Encode.Bytes.Base64BytesProperty", "usage": "Input,Output,Json", "decorators": [], @@ -82,6 +84,7 @@ "$id": "12", "kind": "model", "name": "Base64urlBytesProperty", + "clientNamespace": "Encode.Bytes", "crossLanguageDefinitionId": "Encode.Bytes.Base64urlBytesProperty", "usage": "Input,Output,Json", "decorators": [], @@ -119,6 +122,7 @@ "$id": "17", "kind": "model", "name": "Base64urlArrayBytesProperty", + "clientNamespace": "Encode.Bytes", "crossLanguageDefinitionId": "Encode.Bytes.Base64urlArrayBytesProperty", "usage": "Input,Output,Json", "decorators": [], @@ -172,6 +176,7 @@ { "$id": "24", "Name": "BytesClient", + "ClientNamespace": "Encode.Bytes", "Doc": "Test for encode decorator on bytes.", "Operations": [], "Protocol": { @@ -215,6 +220,7 @@ { "$id": "30", "Name": "Query", + "ClientNamespace": "Encode.Bytes.Query", "Operations": [ { "$id": "31", @@ -475,6 +481,7 @@ { "$id": "54", "Name": "Property", + "ClientNamespace": "Encode.Bytes.Property", "Operations": [ { "$id": "55", @@ -955,6 +962,7 @@ { "$id": "96", "Name": "Header", + "ClientNamespace": "Encode.Bytes.Header", "Operations": [ { "$id": "97", @@ -1215,6 +1223,7 @@ { "$id": "120", "Name": "RequestBody", + "ClientNamespace": "Encode.Bytes.RequestBody", "Operations": [ { "$id": "121", @@ -1660,6 +1669,7 @@ { "$id": "161", "Name": "ResponseBody", + "ClientNamespace": "Encode.Bytes.ResponseBody", "Operations": [ { "$id": "162", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/DatetimeClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/DatetimeClient.cs index 6b8a806e7bd..99b7355986c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/DatetimeClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/DatetimeClient.cs @@ -4,6 +4,10 @@ using System; using System.ClientModel.Primitives; +using Encode.Datetime._Header; +using Encode.Datetime._Property; +using Encode.Datetime._Query; +using Encode.Datetime._ResponseHeader; namespace Encode.Datetime { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/EncodeDatetimeModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/EncodeDatetimeModelFactory.cs index ffba39013b1..229e90dd6f9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/EncodeDatetimeModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/EncodeDatetimeModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public static partial class EncodeDatetimeModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Header.cs index a5d00618278..5fb8d90bc90 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Header.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Datetime +namespace Encode.Datetime._Header { public partial class Header { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..7700e4a154e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Encode.Datetime +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..673c214836c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Encode.Datetime +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..e0532da725b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Encode.Datetime +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4dba61291e4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Encode.Datetime +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs index 1fe9683e1d8..56cb980d37e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class DefaultDatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.cs index 9a559a40189..638fffab3bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/DefaultDatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class DefaultDatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs index ec82204ed10..42876e01a56 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class Rfc3339DatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.cs index 7b25191eabd..9c7b4e74acf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc3339DatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class Rfc3339DatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs index fa77171773c..023ba09bceb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class Rfc7231DatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.cs index 4a30801a24a..89b0ab6ea68 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/Rfc7231DatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class Rfc7231DatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs index e72bb51cd82..11279a8d38f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class UnixTimestampArrayDatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.cs index 28d02dc1f4a..a167722ee4f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampArrayDatetimeProperty.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class UnixTimestampArrayDatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs index 95ffdd23a15..af16f3087d9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class UnixTimestampDatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.cs index 7f2d31c3309..2c46c642682 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Models/UnixTimestampDatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Datetime.Models +namespace Encode.Datetime { public partial class UnixTimestampDatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Property.cs index 370a6c98257..2a05e4eb487 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Property.cs @@ -6,9 +6,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Encode.Datetime.Models; +using Encode.Datetime; -namespace Encode.Datetime +namespace Encode.Datetime._Property { public partial class Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Query.cs index 9bdd9ef2020..797db67529f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/Query.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Datetime +namespace Encode.Datetime._Query { public partial class Query { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/ResponseHeader.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/ResponseHeader.cs index 9ec01d1c0b3..01d39032c85 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/ResponseHeader.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/src/Generated/ResponseHeader.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Datetime +namespace Encode.Datetime._ResponseHeader { public partial class ResponseHeader { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/tspCodeModel.json index 8d5ba355992..1f427ed8f08 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/datetime/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "DefaultDatetimeProperty", + "clientNamespace": "Encode.Datetime", "crossLanguageDefinitionId": "Encode.Datetime.DefaultDatetimeProperty", "usage": "Input,Output,Json", "decorators": [], @@ -52,6 +53,7 @@ "$id": "8", "kind": "model", "name": "Rfc3339DatetimeProperty", + "clientNamespace": "Encode.Datetime", "crossLanguageDefinitionId": "Encode.Datetime.Rfc3339DatetimeProperty", "usage": "Input,Output,Json", "decorators": [], @@ -96,6 +98,7 @@ "$id": "14", "kind": "model", "name": "Rfc7231DatetimeProperty", + "clientNamespace": "Encode.Datetime", "crossLanguageDefinitionId": "Encode.Datetime.Rfc7231DatetimeProperty", "usage": "Input,Output,Json", "decorators": [], @@ -140,6 +143,7 @@ "$id": "20", "kind": "model", "name": "UnixTimestampDatetimeProperty", + "clientNamespace": "Encode.Datetime", "crossLanguageDefinitionId": "Encode.Datetime.UnixTimestampDatetimeProperty", "usage": "Input,Output,Json", "decorators": [], @@ -184,6 +188,7 @@ "$id": "26", "kind": "model", "name": "UnixTimestampArrayDatetimeProperty", + "clientNamespace": "Encode.Datetime", "crossLanguageDefinitionId": "Encode.Datetime.UnixTimestampArrayDatetimeProperty", "usage": "Input,Output,Json", "decorators": [], @@ -251,6 +256,7 @@ { "$id": "35", "Name": "DatetimeClient", + "ClientNamespace": "Encode.Datetime", "Doc": "Test for encode decorator on datetime.", "Operations": [], "Protocol": { @@ -294,6 +300,7 @@ { "$id": "41", "Name": "Query", + "ClientNamespace": "Encode.Datetime.Query", "Operations": [ { "$id": "42", @@ -646,6 +653,7 @@ { "$id": "75", "Name": "Property", + "ClientNamespace": "Encode.Datetime.Property", "Operations": [ { "$id": "76", @@ -1235,6 +1243,7 @@ { "$id": "126", "Name": "Header", + "ClientNamespace": "Encode.Datetime.Header", "Operations": [ { "$id": "127", @@ -1587,6 +1596,7 @@ { "$id": "160", "Name": "ResponseHeader", + "ClientNamespace": "Encode.Datetime.ResponseHeader", "Operations": [ { "$id": "161", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/DurationClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/DurationClient.cs index 115e78f6675..5f2a93cce5a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/DurationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/DurationClient.cs @@ -4,6 +4,9 @@ using System; using System.ClientModel.Primitives; +using Encode.Duration._Header; +using Encode.Duration._Property; +using Encode.Duration._Query; namespace Encode.Duration { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/EncodeDurationModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/EncodeDurationModelFactory.cs index e9a2636ea9e..d35d13762a3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/EncodeDurationModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/EncodeDurationModelFactory.cs @@ -4,8 +4,9 @@ using System; using System.Collections.Generic; +using Encode.Duration._Property; -namespace Encode.Duration.Models +namespace Encode.Duration { public static partial class EncodeDurationModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Header.cs index 4dcb081e36c..cdece107b9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Header.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Duration +namespace Encode.Duration._Header { public partial class Header { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..c3d5d5945dc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Encode.Duration +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..999ce51f409 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Encode.Duration +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..ccf00089121 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Encode.Duration +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4067799cccd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Encode.Duration +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs index 02a6c0994d4..a585a2f08b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class DefaultDurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.cs index 1c5b105085b..140adec59d6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/DefaultDurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class DefaultDurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs index a23bda2153d..d07872f177d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class Float64SecondsDurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.cs index 75410e8b83b..e9b44ec28a9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Float64SecondsDurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class Float64SecondsDurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs index 9fdccbca93b..c8bf5edf832 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class FloatSecondsDurationArrayProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.cs index a2c6050f5d6..c2e8e22fa69 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationArrayProperty.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class FloatSecondsDurationArrayProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs index ad1171abead..49daacde68a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class FloatSecondsDurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.cs index 8f4ff921be8..f4b92d53235 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/FloatSecondsDurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class FloatSecondsDurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs index 1e173d6ce3d..6f55beebdd4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class ISO8601DurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.cs index 6727376e9ff..ed31d37748f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/ISO8601DurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class ISO8601DurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs index a2f57b8719b..5b4e5ff9bca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class Int32SecondsDurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.cs index 1fb8bd75048..ec8e72ef1e2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Models/Int32SecondsDurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace Encode.Duration.Models +namespace Encode.Duration._Property { public partial class Int32SecondsDurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Property.cs index 0895d90cb2b..5d0db52b231 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Property.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Encode.Duration.Models; -namespace Encode.Duration +namespace Encode.Duration._Property { public partial class Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Query.cs index acdba548f78..fd4fe96982d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/src/Generated/Query.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Encode.Duration +namespace Encode.Duration._Query { public partial class Query { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/tspCodeModel.json index 6fbfb570477..a8f107b762d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/duration/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "DefaultDurationProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.DefaultDurationProperty", "usage": "Input,Output,Json", "decorators": [], @@ -52,6 +53,7 @@ "$id": "8", "kind": "model", "name": "ISO8601DurationProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.ISO8601DurationProperty", "usage": "Input,Output,Json", "decorators": [], @@ -96,6 +98,7 @@ "$id": "14", "kind": "model", "name": "Int32SecondsDurationProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.Int32SecondsDurationProperty", "usage": "Input,Output,Json", "decorators": [], @@ -140,6 +143,7 @@ "$id": "20", "kind": "model", "name": "FloatSecondsDurationProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.FloatSecondsDurationProperty", "usage": "Input,Output,Json", "decorators": [], @@ -184,6 +188,7 @@ "$id": "26", "kind": "model", "name": "Float64SecondsDurationProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.Float64SecondsDurationProperty", "usage": "Input,Output,Json", "decorators": [], @@ -228,6 +233,7 @@ "$id": "32", "kind": "model", "name": "FloatSecondsDurationArrayProperty", + "clientNamespace": "Encode.Duration.Property", "crossLanguageDefinitionId": "Encode.Duration.Property.FloatSecondsDurationArrayProperty", "usage": "Input,Output,Json", "decorators": [], @@ -295,6 +301,7 @@ { "$id": "41", "Name": "DurationClient", + "ClientNamespace": "Encode.Duration", "Doc": "Test for encode decorator on duration.", "Operations": [], "Protocol": { @@ -338,6 +345,7 @@ { "$id": "47", "Name": "Query", + "ClientNamespace": "Encode.Duration.Query", "Operations": [ { "$id": "48", @@ -747,6 +755,7 @@ { "$id": "86", "Name": "Property", + "ClientNamespace": "Encode.Duration.Property", "Operations": [ { "$id": "87", @@ -1445,6 +1454,7 @@ { "$id": "146", "Name": "Header", + "ClientNamespace": "Encode.Duration.Header", "Operations": [ { "$id": "147", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs index f0ed9e850ad..f04e857b397 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs @@ -2,7 +2,9 @@ #nullable disable -namespace Encode.Numeric.Models +using Encode.Numeric._Property; + +namespace Encode.Numeric { public static partial class EncodeNumericModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..41459114869 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Encode.Numeric +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..a95a72c82ae --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Encode.Numeric +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..58b7a00fd37 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Encode.Numeric +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..b8707a3d7d8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Encode.Numeric +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs index be6e091563b..0f79cb5ef55 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class SafeintAsStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs index add35f458a1..25504de7ad8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class SafeintAsStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs index b04028cf447..1a5dccee8f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class Uint32AsStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs index 71ec4b040c7..b8d7fead8db 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class Uint32AsStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs index 2d24bdca586..bcee5f51a63 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class Uint8AsStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs index 028f50646ce..449de1921d2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Encode.Numeric.Models +namespace Encode.Numeric._Property { public partial class Uint8AsStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs index 19d179a442b..a43095cc1bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using Encode.Numeric._Property; namespace Encode.Numeric { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs index f3d58fd18b3..49349a4add9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Encode.Numeric.Models; -namespace Encode.Numeric +namespace Encode.Numeric._Property { public partial class Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json index 1bd9a9f72d2..9fdf021d68b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "SafeintAsStringProperty", + "clientNamespace": "Encode.Numeric.Property", "crossLanguageDefinitionId": "Encode.Numeric.Property.SafeintAsStringProperty", "usage": "Input,Output,Json", "decorators": [], @@ -45,6 +46,7 @@ "$id": "7", "kind": "model", "name": "Uint32AsStringProperty", + "clientNamespace": "Encode.Numeric.Property", "crossLanguageDefinitionId": "Encode.Numeric.Property.Uint32AsStringProperty", "usage": "Input,Output,Json", "decorators": [], @@ -82,6 +84,7 @@ "$id": "12", "kind": "model", "name": "Uint8AsStringProperty", + "clientNamespace": "Encode.Numeric.Property", "crossLanguageDefinitionId": "Encode.Numeric.Property.Uint8AsStringProperty", "usage": "Input,Output,Json", "decorators": [], @@ -120,6 +123,7 @@ { "$id": "17", "Name": "NumericClient", + "ClientNamespace": "Encode.Numeric", "Doc": "Test for encode decorator on integer.", "Operations": [], "Protocol": { @@ -163,6 +167,7 @@ { "$id": "23", "Name": "Property", + "ClientNamespace": "Encode.Numeric.Property", "Operations": [ { "$id": "24", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs index f39cc5ea71a..dfb24ed2a43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using Parameters.Basic._ExplicitBody; +using Parameters.Basic._ImplicitBody; namespace Parameters.Basic { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs index 93f38dc924a..383030dc1bf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Parameters.Basic.Models; -namespace Parameters.Basic +namespace Parameters.Basic._ExplicitBody { public partial class ExplicitBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs index d0067bcaaa5..478ec3b4e2e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Parameters.Basic +namespace Parameters.Basic._ImplicitBody { public partial class ImplicitBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..f258a3392d6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Basic +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..b860c52b7ef --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Basic +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6267859c5b1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Basic +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..24b208aff6d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Basic +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs index 66c9081a160..81d0d88a2d5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Parameters.Basic.Models +namespace Parameters.Basic._ExplicitBody { public partial class User : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs index 8315fb7e023..4935f28c343 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Parameters.Basic.Models +namespace Parameters.Basic._ExplicitBody { public partial class User { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs index 3aa6dd75fec..817fdc55fa7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs @@ -2,7 +2,10 @@ #nullable disable -namespace Parameters.Basic.Models +using Parameters.Basic._ExplicitBody; +using Parameters.Basic._ImplicitBody; + +namespace Parameters.Basic { public static partial class ParametersBasicModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json index 875ef09028b..8f458de3c3a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "SimpleRequest", + "clientNamespace": "Parameters.Basic.ImplicitBody", "crossLanguageDefinitionId": "Parameters.Basic.ImplicitBody.simple.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -44,6 +45,7 @@ "$id": "7", "kind": "model", "name": "User", + "clientNamespace": "Parameters.Basic.ExplicitBody", "crossLanguageDefinitionId": "Parameters.Basic.ExplicitBody.User", "usage": "Input,Json", "doc": "This is a simple model.", @@ -82,6 +84,7 @@ { "$id": "12", "Name": "BasicClient", + "ClientNamespace": "Parameters.Basic", "Doc": "Test for basic parameters cases.", "Operations": [], "Protocol": { @@ -125,6 +128,7 @@ { "$id": "18", "Name": "ExplicitBody", + "ClientNamespace": "Parameters.Basic.ExplicitBody", "Operations": [ { "$id": "19", @@ -245,6 +249,7 @@ { "$id": "30", "Name": "ImplicitBody", + "ClientNamespace": "Parameters.Basic.ImplicitBody", "Operations": [ { "$id": "31", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs index 4ea51c3fe65..3c77de1b7fe 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Parameters.BodyOptionality.Models; +using Parameters.BodyOptionality._OptionalExplicit; namespace Parameters.BodyOptionality { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bb599aaf9b4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Parameters.BodyOptionality +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..8cef3f63651 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Parameters.BodyOptionality +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..7007ee37222 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Parameters.BodyOptionality +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..285918a8fa8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Parameters.BodyOptionality +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs index 731bd1de599..04a2308f0fc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Parameters.BodyOptionality.Models +namespace Parameters.BodyOptionality { public partial class BodyModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs index 4c47b163355..5726118c284 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Parameters.BodyOptionality.Models +namespace Parameters.BodyOptionality { public partial class BodyModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs index 13e3b1ac812..94788610cb4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs @@ -6,9 +6,9 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Parameters.BodyOptionality.Models; +using Parameters.BodyOptionality; -namespace Parameters.BodyOptionality +namespace Parameters.BodyOptionality._OptionalExplicit { public partial class OptionalExplicit { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs index 89db8748170..c810ed2aaa2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Parameters.BodyOptionality.Models +namespace Parameters.BodyOptionality { public static partial class ParametersBodyOptionalityModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json index 785f6ae208d..443445ef44a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "BodyModel", + "clientNamespace": "Parameters.BodyOptionality", "crossLanguageDefinitionId": "Parameters.BodyOptionality.BodyModel", "usage": "Input,Spread,Json", "decorators": [], @@ -45,6 +46,7 @@ { "$id": "7", "Name": "BodyOptionalityClient", + "ClientNamespace": "Parameters.BodyOptionality", "Doc": "Test describing optionality of the request body.", "Operations": [ { @@ -241,6 +243,7 @@ { "$id": "25", "Name": "OptionalExplicit", + "ClientNamespace": "Parameters.BodyOptionality.OptionalExplicit", "Operations": [ { "$id": "26", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs index 24fca889cb1..c75beeba0ad 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/CollectionFormatClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using Parameters.CollectionFormat._Header; +using Parameters.CollectionFormat._Query; namespace Parameters.CollectionFormat { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Header.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Header.cs index bda19c88a85..6188a2785ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Header.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Header.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Parameters.CollectionFormat +namespace Parameters.CollectionFormat._Header { public partial class Header { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..3b04704d5c0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Parameters.CollectionFormat +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..97442d15afc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Parameters.CollectionFormat +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..884366614a5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Parameters.CollectionFormat +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..88088bea1c3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Parameters.CollectionFormat +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Query.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Query.cs index 7a9c0bf3ed9..4d8f8215bb9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Query.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/src/Generated/Query.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Parameters.CollectionFormat +namespace Parameters.CollectionFormat._Query { public partial class Query { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/tspCodeModel.json index f0c002b4d9f..de26ade64ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/collection-format/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "CollectionFormatClient", + "ClientNamespace": "Parameters.CollectionFormat", "Doc": "Test for collectionFormat.", "Operations": [], "Protocol": { @@ -51,6 +52,7 @@ { "$id": "8", "Name": "Query", + "ClientNamespace": "Parameters.CollectionFormat.Query", "Operations": [ { "$id": "9", @@ -384,6 +386,7 @@ { "$id": "39", "Name": "Header", + "ClientNamespace": "Parameters.CollectionFormat.Header", "Operations": [ { "$id": "40", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs index dddfff23927..ec8be6a9570 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Parameters.Spread +namespace Parameters.Spread._Alias { public partial class Alias { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..49af0395e52 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Spread +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..15d68810257 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Spread +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..a145c031345 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Spread +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4f1fca39690 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Parameters.Spread +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs index e8a6b3fa29e..31ca1bfeab4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Parameters.Spread.Models; -namespace Parameters.Spread +namespace Parameters.Spread._Model { public partial class Model { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs index 7650825f07d..f7b007553d2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Parameters.Spread.Models +namespace Parameters.Spread._Model { public partial class BodyParameter : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs index 44a28cfe7dc..65fd0ab33f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Parameters.Spread.Models +namespace Parameters.Spread._Model { public partial class BodyParameter { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs index d4d98f26f1c..e3a2f591612 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs @@ -3,8 +3,10 @@ #nullable disable using System.Collections.Generic; +using Parameters.Spread._Alias; +using Parameters.Spread._Model; -namespace Parameters.Spread.Models +namespace Parameters.Spread { public static partial class ParametersSpreadModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs index 5a0dd5de3cf..310ea3031c4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using Parameters.Spread._Alias; +using Parameters.Spread._Model; namespace Parameters.Spread { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json index ba6ff3edb16..e998cc3d6ba 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "SpreadAsRequestBodyRequest", + "clientNamespace": "Parameters.Spread.Alias", "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestBody.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -44,6 +45,7 @@ "$id": "7", "kind": "model", "name": "SpreadParameterWithInnerModelRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerModel.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -80,6 +82,7 @@ "$id": "12", "kind": "model", "name": "SpreadAsRequestParameterRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadAsRequestParameter.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -116,6 +119,7 @@ "$id": "17", "kind": "model", "name": "SpreadWithMultipleParametersRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadWithMultipleParameters.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -248,6 +252,7 @@ "$id": "36", "kind": "model", "name": "SpreadParameterWithInnerAliasRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Parameters.Spread.Alias.spreadParameterWithInnerAlias.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -312,6 +317,7 @@ "$id": "45", "kind": "model", "name": "BodyParameter", + "clientNamespace": "Parameters.Spread.Model", "crossLanguageDefinitionId": "Parameters.Spread.Model.BodyParameter", "usage": "Input,Spread,Json", "doc": "This is a simple model.", @@ -349,6 +355,7 @@ "$id": "50", "kind": "model", "name": "SpreadCompositeRequestMixRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Parameters.Spread.Model.spreadCompositeRequestMix.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -386,6 +393,7 @@ { "$id": "55", "Name": "SpreadClient", + "ClientNamespace": "Parameters.Spread", "Doc": "Test for the spread operator.", "Operations": [], "Protocol": { @@ -429,6 +437,7 @@ { "$id": "61", "Name": "Model", + "ClientNamespace": "Parameters.Spread.Model", "Operations": [ { "$id": "62", @@ -931,6 +940,7 @@ { "$id": "105", "Name": "Alias", + "ClientNamespace": "Parameters.Spread.Alias", "Operations": [ { "$id": "106", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs index 69fee35d13a..3632bd3895d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using Payload.ContentNegotiation._DifferentBody; +using Payload.ContentNegotiation._SameBody; namespace Payload.ContentNegotiation { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs index 3acc6eca8d3..76ada7bada7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Payload.ContentNegotiation.Models; -namespace Payload.ContentNegotiation +namespace Payload.ContentNegotiation._DifferentBody { public partial class DifferentBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..c36fb8f4a38 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Payload.ContentNegotiation +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..f352acf5572 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Payload.ContentNegotiation +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..3ea61f5354d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Payload.ContentNegotiation +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..922e4238c41 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Payload.ContentNegotiation +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs index ee7d5d76e10..4f86c749e43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Payload.ContentNegotiation.Models +namespace Payload.ContentNegotiation._DifferentBody { public partial class PngImageAsJson : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs index e4702348273..c00f030cc5e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs @@ -4,7 +4,7 @@ using System; -namespace Payload.ContentNegotiation.Models +namespace Payload.ContentNegotiation._DifferentBody { public partial class PngImageAsJson { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs index 58e0f7c865c..c69a7d6c00e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs @@ -3,8 +3,9 @@ #nullable disable using System; +using Payload.ContentNegotiation._DifferentBody; -namespace Payload.ContentNegotiation.Models +namespace Payload.ContentNegotiation { public static partial class PayloadContentNegotiationModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs index 35493a8357a..fd6ad96379d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Payload.ContentNegotiation +namespace Payload.ContentNegotiation._SameBody { public partial class SameBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json index 137c9f6812b..eac17f5a96c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "PngImageAsJson", + "clientNamespace": "Payload.ContentNegotiation.DifferentBody", "crossLanguageDefinitionId": "Payload.ContentNegotiation.DifferentBody.PngImageAsJson", "usage": "Output,Json", "decorators": [], @@ -46,6 +47,7 @@ { "$id": "7", "Name": "ContentNegotiationClient", + "ClientNamespace": "Payload.ContentNegotiation", "Doc": "Test describing optionality of the request body.", "Operations": [], "Protocol": { @@ -89,6 +91,7 @@ { "$id": "13", "Name": "SameBody", + "ClientNamespace": "Payload.ContentNegotiation.SameBody", "Operations": [ { "$id": "14", @@ -301,6 +304,7 @@ { "$id": "37", "Name": "DifferentBody", + "ClientNamespace": "Payload.ContentNegotiation.DifferentBody", "Operations": [ { "$id": "38", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..275e86b15c9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Payload.JsonMergePatch +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..82e66dfca3f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Payload.JsonMergePatch +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..a77166ac682 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Payload.JsonMergePatch +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..8cafdc47401 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Payload.JsonMergePatch +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs index 7bfcb15b1bc..bd7a96d4b2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Payload.JsonMergePatch.Models; namespace Payload.JsonMergePatch { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs index 86300a798c4..7c399897270 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Payload.JsonMergePatch.Models +namespace Payload.JsonMergePatch { public partial class InnerModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs index 26138650996..d05f99d4b62 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Payload.JsonMergePatch.Models +namespace Payload.JsonMergePatch { public partial class InnerModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs index 1289a9aa739..f388c4df40b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Payload.JsonMergePatch.Models +namespace Payload.JsonMergePatch { public partial class Resource : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs index 350be2eb5f4..7d2c3b36204 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace Payload.JsonMergePatch.Models +namespace Payload.JsonMergePatch { public partial class Resource { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs index bb48f792b29..ba9ed9f48b5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace Payload.JsonMergePatch.Models +namespace Payload.JsonMergePatch { public static partial class PayloadJsonMergePatchModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json index d7040c4e471..37711265d5d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "Resource", + "clientNamespace": "Payload.JsonMergePatch", "crossLanguageDefinitionId": "Payload.JsonMergePatch.Resource", "usage": "Input,Output,Json", "doc": "Details about a resource.", @@ -84,6 +85,7 @@ "$id": "14", "kind": "model", "name": "InnerModel", + "clientNamespace": "Payload.JsonMergePatch", "crossLanguageDefinitionId": "Payload.JsonMergePatch.InnerModel", "usage": "Input,Output,JsonMergePatch,Json", "doc": "It is the model used by Resource model", @@ -304,6 +306,7 @@ "$id": "45", "kind": "model", "name": "ResourcePatch", + "clientNamespace": "Payload.JsonMergePatch", "crossLanguageDefinitionId": "Payload.JsonMergePatch.ResourcePatch", "usage": "Input,JsonMergePatch,Json", "doc": "Details about a resource for patch operation.", @@ -512,6 +515,7 @@ { "$id": "75", "Name": "JsonMergePatchClient", + "ClientNamespace": "Payload.JsonMergePatch", "Doc": "Test for merge-patch+json content-type", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..74372424c0c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Payload.MediaType +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..9efec3ae643 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Payload.MediaType +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..c06b3b3cb5c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Payload.MediaType +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..31e4af7bd63 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Payload.MediaType +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs index 6aee71cdbf1..6e34839a39c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using Payload.MediaType._StringBody; namespace Payload.MediaType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs index b0e91a7020d..f31c4875707 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Payload.MediaType +namespace Payload.MediaType._StringBody { public partial class StringBody { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json index 9bc86bebe4c..eebf0b00c70 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "MediaTypeClient", + "ClientNamespace": "Payload.MediaType", "Doc": "Test the payload with different media types and different types of the payload itself.", "Operations": [], "Protocol": { @@ -51,6 +52,7 @@ { "$id": "8", "Name": "StringBody", + "ClientNamespace": "Payload.MediaType.StringBody", "Operations": [ { "$id": "9", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormData.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormData.cs index e6f6b6397e9..0d2268a2a18 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormData.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormData.cs @@ -5,8 +5,9 @@ using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; +using Payload.MultiPart._FormData.HttpParts; -namespace Payload.MultiPart +namespace Payload.MultiPart._FormData { public partial class FormData { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpParts.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpParts.cs index ea265b0c80a..033e295e92d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpParts.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpParts.cs @@ -5,8 +5,10 @@ using System.ClientModel; using System.ClientModel.Primitives; using System.Threading.Tasks; +using Payload.MultiPart._FormData.HttpParts.ContentType; +using Payload.MultiPart._FormData.HttpParts.NonString; -namespace Payload.MultiPart +namespace Payload.MultiPart._FormData.HttpParts { public partial class FormDataHttpParts { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs index 480e3a74994..32cb80df3d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsContentType.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Threading.Tasks; -namespace Payload.MultiPart +namespace Payload.MultiPart._FormData.HttpParts.ContentType { public partial class FormDataHttpPartsContentType { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs index 7774f553662..47557d7876b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/FormDataHttpPartsNonString.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Threading.Tasks; -namespace Payload.MultiPart +namespace Payload.MultiPart._FormData.HttpParts.NonString { public partial class FormDataHttpPartsNonString { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a137e4161df --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Payload.MultiPart +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..e0cea260da8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Payload.MultiPart +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..05cd4bfaa9a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Payload.MultiPart +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..b426e12cd91 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Payload.MultiPart +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/MultiPartClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/MultiPartClient.cs index 8628a0b7f5c..cd0cceb3f85 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/MultiPartClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/src/Generated/MultiPartClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using Payload.MultiPart._FormData; namespace Payload.MultiPart { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/tspCodeModel.json index eef5bd593fd..029684d0fbe 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/multipart/tspCodeModel.json @@ -30,6 +30,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Payload.MultiPart", "doc": "The FileSpecificContentType_contentType", "isFixed": false, "isFlags": false, @@ -42,6 +43,7 @@ "$id": "5", "kind": "model", "name": "MultiPartRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.MultiPartRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -111,6 +113,7 @@ "$id": "14", "kind": "model", "name": "ComplexPartsRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.ComplexPartsRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -153,6 +156,7 @@ "$id": "20", "kind": "model", "name": "Address", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.Address", "usage": "Input", "decorators": [], @@ -274,6 +278,7 @@ "$id": "35", "kind": "model", "name": "JsonPartRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.JsonPartRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -339,6 +344,7 @@ "$id": "43", "kind": "model", "name": "BinaryArrayPartsRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.BinaryArrayPartsRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -415,6 +421,7 @@ "$id": "53", "kind": "model", "name": "MultiBinaryPartsRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.MultiBinaryPartsRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -485,6 +492,7 @@ "$id": "62", "kind": "model", "name": "AnonymousModelRequest", + "clientNamespace": "", "crossLanguageDefinitionId": "Payload.MultiPart.FormData.anonymousModel.Request.anonymous", "usage": "MultipartFormData,Spread", "decorators": [], @@ -525,6 +533,7 @@ "$id": "67", "kind": "model", "name": "ComplexHttpPartsModelRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.ComplexHttpPartsModelRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -596,6 +605,7 @@ "$id": "76", "kind": "model", "name": "FileRequiredMetaData", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileRequiredMetaData", "usage": "Input", "decorators": [], @@ -603,6 +613,7 @@ "$id": "77", "kind": "model", "name": "File", + "clientNamespace": "TypeSpec.Http", "crossLanguageDefinitionId": "TypeSpec.Http.File", "usage": "Input", "decorators": [], @@ -930,6 +941,7 @@ "$id": "4781", "kind": "model", "name": "FloatRequest", + "clientNamespace": "Payload.MultiPart.FormData.HttpParts.NonString", "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.anonymous", "usage": "Input,MultipartFormData", "decorators": [], @@ -1001,6 +1013,7 @@ "$id": "5620", "kind": "model", "name": "FloatRequestTemperature", + "clientNamespace": "Payload.MultiPart.FormData.HttpParts.NonString", "crossLanguageDefinitionId": "Payload.MultiPart.FormData.HttpParts.NonString.float.Request.temperature.anonymous", "usage": "Input", "decorators": [], @@ -1010,6 +1023,7 @@ "$id": "5621", "kind": "model", "name": "FileWithHttpPartSpecificContentTypeRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartSpecificContentTypeRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -1023,6 +1037,7 @@ "$id": "5623", "kind": "model", "name": "FileSpecificContentType", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileSpecificContentType", "usage": "Input", "decorators": [], @@ -1168,6 +1183,7 @@ "$id": "5642", "kind": "model", "name": "FileWithHttpPartRequiredContentTypeRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartRequiredContentTypeRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -1259,6 +1275,7 @@ "$id": "5652", "kind": "model", "name": "FileWithHttpPartOptionalContentTypeRequest", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileWithHttpPartOptionalContentTypeRequest", "usage": "Input,MultipartFormData", "decorators": [], @@ -1272,6 +1289,7 @@ "$id": "5654", "kind": "model", "name": "FileOptionalContentType", + "clientNamespace": "Payload.MultiPart", "crossLanguageDefinitionId": "Payload.MultiPart.FileOptionalContentType", "usage": "Input", "decorators": [], @@ -1386,6 +1404,7 @@ { "$id": "5668", "Name": "MultiPartClient", + "ClientNamespace": "Payload.MultiPart", "Doc": "Test for multipart", "Operations": [], "Protocol": { @@ -1429,6 +1448,7 @@ { "$id": "5674", "Name": "FormData", + "ClientNamespace": "Payload.MultiPart.FormData", "Operations": [ { "$id": "5675", @@ -2005,6 +2025,7 @@ { "$id": "5722", "Name": "FormDataHttpParts", + "ClientNamespace": "Payload.MultiPart.FormData.HttpParts", "Operations": [ { "$id": "5723", @@ -2125,6 +2146,7 @@ { "$id": "5734", "Name": "FormDataHttpPartsContentType", + "ClientNamespace": "Payload.MultiPart.FormData.HttpParts.ContentType", "Operations": [ { "$id": "5735", @@ -2397,6 +2419,7 @@ { "$id": "5758", "Name": "FormDataHttpPartsNonString", + "ClientNamespace": "Payload.MultiPart.FormData.HttpParts.NonString", "Operations": [ { "$id": "5759", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json index 20315a264ae..1b6914225c8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Resiliency.SrvDriven.V1", + "namespace": "Resiliency.ServiceDriven", "library-name": "Resiliency.SrvDriven.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..acc53eae0f8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..c5672ff9982 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..d26745ae386 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6cafceae64b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs index 130f148e874..2b7c994e78a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Resiliency.SrvDriven.V1 +namespace Resiliency.ServiceDriven { public partial class ResiliencyServiceDrivenClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs index adf5be0b0fb..d5dd7cc38e0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Resiliency.SrvDriven.V1 +namespace Resiliency.ServiceDriven { public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/tspCodeModel.json index d850374c8ec..148d26a9d65 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Resiliency.ServiceDriven", "doc": "Service versions.", "isFixed": true, "isFlags": false, @@ -49,6 +50,7 @@ { "$id": "6", "Name": "ResiliencyServiceDrivenClient", + "ClientNamespace": "Resiliency.ServiceDriven", "Doc": "Test that we can grow up a service spec and service deployment into a multi-versioned service with full client support.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json index 25aeb821d2c..c194fca32ed 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Resiliency.SrvDriven.V2", + "namespace": "Resiliency.ServiceDriven", "library-name": "Resiliency.SrvDriven.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..acc53eae0f8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..c5672ff9982 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..d26745ae386 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6cafceae64b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Resiliency.ServiceDriven +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs index 11797d94b68..c13b71b73bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Resiliency.SrvDriven.V2 +namespace Resiliency.ServiceDriven { public partial class ResiliencyServiceDrivenClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs index 11ababcb630..233945b82e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Resiliency.SrvDriven.V2 +namespace Resiliency.ServiceDriven { public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/tspCodeModel.json index 6e9845b9301..c18d6cae027 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/tspCodeModel.json @@ -56,6 +56,7 @@ "decorators": [] } ], + "clientNamespace": "Resiliency.ServiceDriven", "doc": "Service versions", "isFixed": true, "isFlags": false, @@ -68,6 +69,7 @@ { "$id": "8", "Name": "ResiliencyServiceDrivenClient", + "ClientNamespace": "Resiliency.ServiceDriven", "Doc": "Test that we can grow up a service spec and service deployment into a multi-versioned service with full client support.\n\nThere are three concepts that should be clarified:\n1. Client spec version: refers to the spec that the client is generated from. 'v1' is a client generated from old.tsp and 'v2' is a client generated from main.tsp.\n2. Service deployment version: refers to a deployment version of the service. 'v1' represents the initial deployment of the service with a single api version. 'v2' represents the new deployment of a service with multiple api versions\n3. Api version: The initial deployment of the service only supports api version 'v1'. The new deployment of the service supports api versions 'v1' and 'v2'.\n\nWe test the following configurations from this service spec:\n- A client generated from the second service spec can call the second deployment of a service with api version v1\n- A client generated from the second service spec can call the second deployment of a service with api version v2", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..71eacaacb7e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Routes +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..15d6615e320 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Routes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..cfd327f3444 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Routes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..99cde8b97f4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Routes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParameters.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParameters.cs index 945f9d0567b..3e17767b7d8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParameters.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParameters.cs @@ -6,8 +6,13 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Routes._PathParameters.LabelExpansion; +using Routes._PathParameters.MatrixExpansion; +using Routes._PathParameters.PathExpansion; +using Routes._PathParameters.ReservedExpansion; +using Routes._PathParameters.SimpleExpansion; -namespace Routes +namespace Routes._PathParameters { public partial class PathParameters { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansion.cs index 4de49378054..b7d6a6cbc7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansion.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._PathParameters.LabelExpansion.Explode; +using Routes._PathParameters.LabelExpansion.Standard; -namespace Routes +namespace Routes._PathParameters.LabelExpansion { public partial class PathParametersLabelExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs index d844af2bc54..79470e680e1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.LabelExpansion.Explode { public partial class PathParametersLabelExpansionExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs index 1044215dcbb..0b742d05724 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersLabelExpansionStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.LabelExpansion.Standard { public partial class PathParametersLabelExpansionStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansion.cs index edf251d39ba..6bf98190256 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansion.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._PathParameters.MatrixExpansion.Explode; +using Routes._PathParameters.MatrixExpansion.Standard; -namespace Routes +namespace Routes._PathParameters.MatrixExpansion { public partial class PathParametersMatrixExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs index 480cf409e39..b92df406571 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.MatrixExpansion.Explode { public partial class PathParametersMatrixExpansionExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs index 78dc9904356..d40c1696d15 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersMatrixExpansionStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.MatrixExpansion.Standard { public partial class PathParametersMatrixExpansionStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansion.cs index c8826f72f6a..ec2f665c1a2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansion.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._PathParameters.PathExpansion.Explode; +using Routes._PathParameters.PathExpansion.Standard; -namespace Routes +namespace Routes._PathParameters.PathExpansion { public partial class PathParametersPathExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionExplode.cs index 55e0c1452e7..b7f10f1c6d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.PathExpansion.Explode { public partial class PathParametersPathExpansionExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionStandard.cs index 0102ff7ca14..d58ca6fbc4d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersPathExpansionStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.PathExpansion.Standard { public partial class PathParametersPathExpansionStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersReservedExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersReservedExpansion.cs index 95361432399..3becc3ca8f2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersReservedExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersReservedExpansion.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.ReservedExpansion { public partial class PathParametersReservedExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansion.cs index 00b73ea9386..cb3b2ce1c3a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansion.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._PathParameters.SimpleExpansion.Explode; +using Routes._PathParameters.SimpleExpansion.Standard; -namespace Routes +namespace Routes._PathParameters.SimpleExpansion { public partial class PathParametersSimpleExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs index 2a4e7a7fbc6..00c4d218a1c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.SimpleExpansion.Explode { public partial class PathParametersSimpleExpansionExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs index a54c64a0e93..63477a318ae 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/PathParametersSimpleExpansionStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._PathParameters.SimpleExpansion.Standard { public partial class PathParametersSimpleExpansionStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParameters.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParameters.cs index eafad598a30..4ccfde73030 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParameters.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParameters.cs @@ -6,8 +6,10 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Routes._QueryParameters.QueryContinuation; +using Routes._QueryParameters.QueryExpansion; -namespace Routes +namespace Routes._QueryParameters { public partial class QueryParameters { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuation.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuation.cs index 7222c40a59c..c1e1821e791 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuation.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuation.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._QueryParameters.QueryContinuation.Explode; +using Routes._QueryParameters.QueryContinuation.Standard; -namespace Routes +namespace Routes._QueryParameters.QueryContinuation { public partial class QueryParametersQueryContinuation { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs index 8f017e26d83..b9a3cb696d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._QueryParameters.QueryContinuation.Explode { public partial class QueryParametersQueryContinuationExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs index e9c366e4981..679ca546a46 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryContinuationStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._QueryParameters.QueryContinuation.Standard { public partial class QueryParametersQueryContinuationStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansion.cs index 50c31360a4b..7038262cc30 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansion.cs @@ -3,8 +3,10 @@ #nullable disable using System.ClientModel.Primitives; +using Routes._QueryParameters.QueryExpansion.Explode; +using Routes._QueryParameters.QueryExpansion.Standard; -namespace Routes +namespace Routes._QueryParameters.QueryExpansion { public partial class QueryParametersQueryExpansion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs index af8a04a49ef..cedde7fe6aa 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionExplode.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._QueryParameters.QueryExpansion.Explode { public partial class QueryParametersQueryExpansionExplode { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs index f0a66a020e8..dd88da3b509 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/QueryParametersQueryExpansionStandard.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Routes +namespace Routes._QueryParameters.QueryExpansion.Standard { public partial class QueryParametersQueryExpansionStandard { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/RoutesClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/RoutesClient.cs index c2bb7449fb1..7b3edc83edf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/RoutesClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/src/Generated/RoutesClient.cs @@ -7,6 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; +using Routes._PathParameters; +using Routes._QueryParameters; namespace Routes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/tspCodeModel.json index 1bdcb3c1bbc..8917c780591 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/routes/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "RoutesClient", + "ClientNamespace": "Routes", "Doc": "Define scenario in building the http route/uri", "Operations": [ { @@ -79,6 +80,7 @@ { "$id": "10", "Name": "PathParameters", + "ClientNamespace": "Routes.PathParameters", "Operations": [ { "$id": "11", @@ -270,6 +272,7 @@ { "$id": "28", "Name": "PathParametersReservedExpansion", + "ClientNamespace": "Routes.PathParameters.ReservedExpansion", "Operations": [ { "$id": "29", @@ -412,6 +415,7 @@ { "$id": "42", "Name": "PathParametersSimpleExpansion", + "ClientNamespace": "Routes.PathParameters.SimpleExpansion", "Operations": [], "Protocol": { "$id": "43" @@ -455,6 +459,7 @@ { "$id": "48", "Name": "PathParametersSimpleExpansionStandard", + "ClientNamespace": "Routes.PathParameters.SimpleExpansion.Standard", "Operations": [ { "$id": "49", @@ -665,6 +670,7 @@ { "$id": "69", "Name": "PathParametersSimpleExpansionExplode", + "ClientNamespace": "Routes.PathParameters.SimpleExpansion.Explode", "Operations": [ { "$id": "70", @@ -875,6 +881,7 @@ { "$id": "90", "Name": "PathParametersPathExpansion", + "ClientNamespace": "Routes.PathParameters.PathExpansion", "Operations": [], "Protocol": { "$id": "91" @@ -918,6 +925,7 @@ { "$id": "96", "Name": "PathParametersPathExpansionStandard", + "ClientNamespace": "Routes.PathParameters.PathExpansion.Standard", "Operations": [ { "$id": "97", @@ -1128,6 +1136,7 @@ { "$id": "117", "Name": "PathParametersPathExpansionExplode", + "ClientNamespace": "Routes.PathParameters.PathExpansion.Explode", "Operations": [ { "$id": "118", @@ -1338,6 +1347,7 @@ { "$id": "138", "Name": "PathParametersLabelExpansion", + "ClientNamespace": "Routes.PathParameters.LabelExpansion", "Operations": [], "Protocol": { "$id": "139" @@ -1381,6 +1391,7 @@ { "$id": "144", "Name": "PathParametersLabelExpansionStandard", + "ClientNamespace": "Routes.PathParameters.LabelExpansion.Standard", "Operations": [ { "$id": "145", @@ -1591,6 +1602,7 @@ { "$id": "165", "Name": "PathParametersLabelExpansionExplode", + "ClientNamespace": "Routes.PathParameters.LabelExpansion.Explode", "Operations": [ { "$id": "166", @@ -1801,6 +1813,7 @@ { "$id": "186", "Name": "PathParametersMatrixExpansion", + "ClientNamespace": "Routes.PathParameters.MatrixExpansion", "Operations": [], "Protocol": { "$id": "187" @@ -1844,6 +1857,7 @@ { "$id": "192", "Name": "PathParametersMatrixExpansionStandard", + "ClientNamespace": "Routes.PathParameters.MatrixExpansion.Standard", "Operations": [ { "$id": "193", @@ -2054,6 +2068,7 @@ { "$id": "213", "Name": "PathParametersMatrixExpansionExplode", + "ClientNamespace": "Routes.PathParameters.MatrixExpansion.Explode", "Operations": [ { "$id": "214", @@ -2264,6 +2279,7 @@ { "$id": "234", "Name": "QueryParameters", + "ClientNamespace": "Routes.QueryParameters", "Operations": [ { "$id": "235", @@ -2455,6 +2471,7 @@ { "$id": "252", "Name": "QueryParametersQueryExpansion", + "ClientNamespace": "Routes.QueryParameters.QueryExpansion", "Operations": [], "Protocol": { "$id": "253" @@ -2498,6 +2515,7 @@ { "$id": "258", "Name": "QueryParametersQueryExpansionStandard", + "ClientNamespace": "Routes.QueryParameters.QueryExpansion.Standard", "Operations": [ { "$id": "259", @@ -2708,6 +2726,7 @@ { "$id": "279", "Name": "QueryParametersQueryExpansionExplode", + "ClientNamespace": "Routes.QueryParameters.QueryExpansion.Explode", "Operations": [ { "$id": "280", @@ -2918,6 +2937,7 @@ { "$id": "300", "Name": "QueryParametersQueryContinuation", + "ClientNamespace": "Routes.QueryParameters.QueryContinuation", "Operations": [], "Protocol": { "$id": "301" @@ -2961,6 +2981,7 @@ { "$id": "306", "Name": "QueryParametersQueryContinuationStandard", + "ClientNamespace": "Routes.QueryParameters.QueryContinuation.Standard", "Operations": [ { "$id": "307", @@ -3171,6 +3192,7 @@ { "$id": "327", "Name": "QueryParametersQueryContinuationExplode", + "ClientNamespace": "Routes.QueryParameters.QueryContinuation.Explode", "Operations": [ { "$id": "328", @@ -3381,6 +3403,7 @@ { "$id": "348", "Name": "InInterface", + "ClientNamespace": "Routes", "Operations": [ { "$id": "349", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..7015d883bbe --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Serialization.EncodedName.Json +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..c61be9b2ec5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Serialization.EncodedName.Json +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..8ecd2eeba9b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Serialization.EncodedName.Json +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..30012df32b3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Serialization.EncodedName.Json +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs index ee2f63bc67c..0e13b569cc6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs @@ -4,6 +4,7 @@ using System; using System.ClientModel.Primitives; +using Serialization.EncodedName.Json._Property; namespace Serialization.EncodedName.Json { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs index 52eff4039d4..39891550dfc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Serialization.EncodedName.Json.Models +namespace Serialization.EncodedName.Json._Property { public partial class JsonEncodedNameModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs index e7fd6d85275..6ddf9f6b59f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Serialization.EncodedName.Json.Models +namespace Serialization.EncodedName.Json._Property { public partial class JsonEncodedNameModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs index ab46ec67671..2a1aea1756d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Serialization.EncodedName.Json.Models; -namespace Serialization.EncodedName.Json +namespace Serialization.EncodedName.Json._Property { public partial class Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs index 561dbaa0723..e51fca01066 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs @@ -2,7 +2,9 @@ #nullable disable -namespace Serialization.EncodedName.Json.Models +using Serialization.EncodedName.Json._Property; + +namespace Serialization.EncodedName.Json { public static partial class SerializationEncodedNameJsonModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json index 50cf829b77a..65edf182022 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "JsonEncodedNameModel", + "clientNamespace": "Serialization.EncodedName.Json.Property", "crossLanguageDefinitionId": "Serialization.EncodedName.Json.Property.JsonEncodedNameModel", "usage": "Input,Output,Json", "decorators": [], @@ -46,6 +47,7 @@ { "$id": "7", "Name": "JsonClient", + "ClientNamespace": "Serialization.EncodedName.Json", "Doc": "Projection", "Operations": [], "Protocol": { @@ -89,6 +91,7 @@ { "$id": "13", "Name": "Property", + "ClientNamespace": "Serialization.EncodedName.Json.Property", "Operations": [ { "$id": "14", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..e958e5e0d62 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Server.Endpoint.NotDefined +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..95cdd55f85f --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Server.Endpoint.NotDefined +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..44149464a4e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Server.Endpoint.NotDefined +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..72879462fd7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Server.Endpoint.NotDefined +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json index 2ab00f81615..b709fe40a0a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "NotDefinedClient", + "ClientNamespace": "Server.Endpoint.NotDefined", "Doc": "Illustrates server doesn't define endpoint. Client should automatically add an endpoint to let user pass in.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..04a2d19d837 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Multiple +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..7992a2c652a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Multiple +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..e6d8bff364e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Multiple +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..b5b09dc4924 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Multiple +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/tspCodeModel.json index 198f6ce797b..eddef96690e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/multiple/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Server.Path.Multiple", "doc": "Service versions", "isFixed": true, "isFlags": false, @@ -49,6 +50,7 @@ { "$id": "6", "Name": "MultipleClient", + "ClientNamespace": "Server.Path.Multiple", "Operations": [ { "$id": "7", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..71e131bd053 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Single +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..bdbcfe730f6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Single +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..fc6eec932e7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Single +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..9efd73264ac --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Server.Path.Single +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json index 1233ed4a75b..502196f3ff6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "SingleClient", + "ClientNamespace": "Server.Path.Single", "Doc": "Illustrates server with a single path parameter @server", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..ad93c0e4775 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.NotVersioned +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..ef56dc2631e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.NotVersioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..8c56643c147 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.NotVersioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..7e1cc4ad2fe --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.NotVersioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json index c337d4f2e00..0d095ffaf47 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "NotVersionedClient", + "ClientNamespace": "Server.Versions.NotVersioned", "Doc": "Illustrates not-versioned server.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..07aff71fb13 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.Versioned +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..de2216e6c8e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.Versioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..e64170bc5f3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.Versioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..2144c02f06b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Server.Versions.Versioned +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/tspCodeModel.json index a9eb23eb2f1..b0052fc0971 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/versioned/tspCodeModel.json @@ -56,6 +56,7 @@ "decorators": [] } ], + "clientNamespace": "Server.Versions.Versioned", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -68,6 +69,7 @@ { "$id": "8", "Name": "VersionedClient", + "ClientNamespace": "Server.Versions.Versioned", "Doc": "Illustrates versioned server.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..55431ecf272 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.ConditionalRequest +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..13097658af8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.ConditionalRequest +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..739ddda4ada --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.ConditionalRequest +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..2ed9d7fd993 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.ConditionalRequest +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json index 4a91ded18f4..37200b3689f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "ConditionalRequestClient", + "ClientNamespace": "SpecialHeaders.ConditionalRequest", "Doc": "Illustrates conditional request headers", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..e9886792de3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.Repeatability +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..cce489f1991 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.Repeatability +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..de4a926e008 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.Repeatability +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..44ad868b923 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace SpecialHeaders.Repeatability +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json index 45ae9d901df..56201c6018e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json @@ -51,6 +51,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Output", @@ -62,6 +63,7 @@ { "$id": "8", "Name": "RepeatabilityClient", + "ClientNamespace": "SpecialHeaders.Repeatability", "Doc": "Illustrates OASIS repeatability headers", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..5fab01351e5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace SpecialWords +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..1ca50c4f2a4 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace SpecialWords +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..b758f5044b6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace SpecialWords +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..c65140440f9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace SpecialWords +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs index d8ea4bf5da9..00c4b992da7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using SpecialWords.Models; -namespace SpecialWords +namespace SpecialWords._ModelProperties { public partial class ModelProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelsOps.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models.cs similarity index 99% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelsOps.cs rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models.cs index 62aab4211db..af9e99fa778 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelsOps.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models.cs @@ -6,13 +6,12 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using SpecialWords.Models; -namespace SpecialWords +namespace SpecialWords._Models { - public partial class ModelsOps + public partial class Models { - protected ModelsOps() => throw null; + protected Models() => throw null; public ClientPipeline Pipeline => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs index c7df51f7c4d..a0aa2cca46f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class And : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs index b7c45eda076..728fe3b4c46 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class And { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs index 698b4878ee9..925a6d11628 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class As : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs index 1bd8e0dba61..1363f52dc3e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class As { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs index 862a0682842..52cd42efac3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Assert : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs index 905ca7d3ef9..64bf8ba1d64 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Assert { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs index 687ce2966c0..94c0e0b900f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Async : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs index 0b773002066..d0a53cbfe74 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Async { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs index 1396bc7b159..61f2930bfc2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Await : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs index 17fbe1b28f0..edcc32cd2bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Await { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs index c47a980129b..a5f08f0a6ae 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Break : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs index a512dccfc75..a332782193e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Break { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs index e5115c2bb45..69764a47ce4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Class : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs index 884694878d1..241f250a4eb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Class { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs index e0e924bc241..3e657b1297d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Constructor : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs index e10a514cc2c..296ca9416f4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Constructor { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs index 19c7ab3471b..e313eced71b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Continue : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs index f4a2b8b546d..c47a50e0ecb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Continue { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs index 9cdf4f3ffc3..6b63641a26e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Def : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs index c73b8f0cc02..299db9885e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Def { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs index 4d3ddae869c..d6913c2e720 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Del : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs index 028772c714b..ed99d01138d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Del { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs index 946a4099f9c..4c050bdf6ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Elif : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs index c5f4e356fce..343a50061bd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Elif { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs index f327c06c1df..084bd94b145 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Else : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs index 492e73fe2aa..38035d83064 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Else { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs index d9fe8c44268..e4b5bd7d6b3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Except : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs index a5cc106de06..524b23f0df7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Except { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs index 3de02c325bb..2289fa1502c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Exec : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs index 5623e24b050..b713f39fdc0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Exec { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs index 305bf469045..737c4c135d2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Finally : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs index 85da1949de0..b3970995408 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Finally { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs index a00cafbe6ca..acb36be5eaf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class For : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs index 29995cfd29c..f34d78f3052 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class For { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs index fb5b92dd748..ef034b58fbc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class From : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs index 3ff114dec7d..c277f5ca105 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class From { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs index 4f09a7efdda..44bd0faea14 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Global : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs index eb62cfd27dd..49639ff57c0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Global { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs index 3fc3b687970..6e82ae71e24 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class If : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs index 66f198377e6..ada1652b9c1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class If { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs index 4da59843acd..857d81180b6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Import : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs index 694d050d25f..23d61f75572 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Import { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs index 0e6c8e88ded..5b44939d6b2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class In : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs index e4141191585..1a746e35502 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class In { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs index 3b15259b564..ca724be20bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Is : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs index 8bb7d5c01b4..156f0ff8dba 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Is { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs index 614e133ffaf..15f35e54bb6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Lambda : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs index da04b16448a..bb8e84c0e7b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Lambda { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs index 98e91e41c6a..f0d19ca6ef3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Not : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs index 1da4180f49f..c0bd2a71842 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Not { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs index 95283c78bb3..6fca1d21624 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Or : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs index dcdd5b15e10..2b27ef0549e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Or { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs index 326bfa5d070..ca9870fa8ad 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Pass : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs index 2170870a529..4fe85b8dbb0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Pass { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs index dcf9e0fd4ff..0ad2c821006 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Raise : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs index 4be83bb1b47..62fef8581c5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Raise { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs index d4cf545a42f..2e9374655be 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Return : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs index 3bd31a26d98..8cc98fcfae0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Return { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs index 475fbaeb799..2f22a876b04 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._ModelProperties { public partial class SameAsModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs index db11890a1a9..5679b66cec8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._ModelProperties { public partial class SameAsModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs index f53a35b3e29..a4572e0d073 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Try : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs index bf63a5fa51b..535d21c31f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Try { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs index e921674ce36..540d44ab4f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class While : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs index d68702e278c..346821c7cb5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class While { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs index 7cddff41a9e..0fe6fceeaf9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class With : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs index d25f219b8a8..0efc77cf429 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class With { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs index 1d6e88390d2..5207357f4cf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Yield : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs index 89e99b62da6..3ddd5dbcc54 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SpecialWords.Models +namespace SpecialWords._Models { public partial class Yield { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs index e1d2c996a5e..7d18528a04e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs @@ -4,6 +4,8 @@ using System; using System.ClientModel.Primitives; +using SpecialWords._ModelProperties; +using SpecialWords._Models; namespace SpecialWords { @@ -15,7 +17,7 @@ public partial class SpecialWordsClient public ClientPipeline Pipeline => throw null; - public virtual ModelsOps GetModelsOpsClient() => throw null; + public virtual Models GetModelsClient() => throw null; public virtual ModelProperties GetModelPropertiesClient() => throw null; diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs index 67b040663a9..a84f6e9e547 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs @@ -2,7 +2,10 @@ #nullable disable -namespace SpecialWords.Models +using SpecialWords._ModelProperties; +using SpecialWords._Models; + +namespace SpecialWords { public static partial class SpecialWordsModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json index 085650d1a23..d2165fc702f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "SameAsModel", + "clientNamespace": "SpecialWords.ModelProperties", "crossLanguageDefinitionId": "SpecialWords.ModelProperties.SameAsModel", "usage": "Input,Json", "decorators": [], @@ -44,6 +45,7 @@ "$id": "7", "kind": "model", "name": "and", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.and", "usage": "Input,Json", "decorators": [], @@ -80,6 +82,7 @@ "$id": "12", "kind": "model", "name": "as", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.as", "usage": "Input,Json", "decorators": [], @@ -116,6 +119,7 @@ "$id": "17", "kind": "model", "name": "assert", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.assert", "usage": "Input,Json", "decorators": [], @@ -152,6 +156,7 @@ "$id": "22", "kind": "model", "name": "async", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.async", "usage": "Input,Json", "decorators": [], @@ -188,6 +193,7 @@ "$id": "27", "kind": "model", "name": "await", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.await", "usage": "Input,Json", "decorators": [], @@ -224,6 +230,7 @@ "$id": "32", "kind": "model", "name": "break", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.break", "usage": "Input,Json", "decorators": [], @@ -260,6 +267,7 @@ "$id": "37", "kind": "model", "name": "class", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.class", "usage": "Input,Json", "decorators": [], @@ -296,6 +304,7 @@ "$id": "42", "kind": "model", "name": "constructor", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.constructor", "usage": "Input,Json", "decorators": [], @@ -332,6 +341,7 @@ "$id": "47", "kind": "model", "name": "continue", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.continue", "usage": "Input,Json", "decorators": [], @@ -368,6 +378,7 @@ "$id": "52", "kind": "model", "name": "def", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.def", "usage": "Input,Json", "decorators": [], @@ -404,6 +415,7 @@ "$id": "57", "kind": "model", "name": "del", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.del", "usage": "Input,Json", "decorators": [], @@ -440,6 +452,7 @@ "$id": "62", "kind": "model", "name": "elif", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.elif", "usage": "Input,Json", "decorators": [], @@ -476,6 +489,7 @@ "$id": "67", "kind": "model", "name": "else", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.else", "usage": "Input,Json", "decorators": [], @@ -512,6 +526,7 @@ "$id": "72", "kind": "model", "name": "except", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.except", "usage": "Input,Json", "decorators": [], @@ -548,6 +563,7 @@ "$id": "77", "kind": "model", "name": "exec", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.exec", "usage": "Input,Json", "decorators": [], @@ -584,6 +600,7 @@ "$id": "82", "kind": "model", "name": "finally", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.finally", "usage": "Input,Json", "decorators": [], @@ -620,6 +637,7 @@ "$id": "87", "kind": "model", "name": "for", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.for", "usage": "Input,Json", "decorators": [], @@ -656,6 +674,7 @@ "$id": "92", "kind": "model", "name": "from", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.from", "usage": "Input,Json", "decorators": [], @@ -692,6 +711,7 @@ "$id": "97", "kind": "model", "name": "global", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.global", "usage": "Input,Json", "decorators": [], @@ -728,6 +748,7 @@ "$id": "102", "kind": "model", "name": "if", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.if", "usage": "Input,Json", "decorators": [], @@ -764,6 +785,7 @@ "$id": "107", "kind": "model", "name": "import", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.import", "usage": "Input,Json", "decorators": [], @@ -800,6 +822,7 @@ "$id": "112", "kind": "model", "name": "in", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.in", "usage": "Input,Json", "decorators": [], @@ -836,6 +859,7 @@ "$id": "117", "kind": "model", "name": "is", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.is", "usage": "Input,Json", "decorators": [], @@ -872,6 +896,7 @@ "$id": "122", "kind": "model", "name": "lambda", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.lambda", "usage": "Input,Json", "decorators": [], @@ -908,6 +933,7 @@ "$id": "127", "kind": "model", "name": "not", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.not", "usage": "Input,Json", "decorators": [], @@ -944,6 +970,7 @@ "$id": "132", "kind": "model", "name": "or", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.or", "usage": "Input,Json", "decorators": [], @@ -980,6 +1007,7 @@ "$id": "137", "kind": "model", "name": "pass", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.pass", "usage": "Input,Json", "decorators": [], @@ -1016,6 +1044,7 @@ "$id": "142", "kind": "model", "name": "raise", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.raise", "usage": "Input,Json", "decorators": [], @@ -1052,6 +1081,7 @@ "$id": "147", "kind": "model", "name": "return", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.return", "usage": "Input,Json", "decorators": [], @@ -1088,6 +1118,7 @@ "$id": "152", "kind": "model", "name": "try", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.try", "usage": "Input,Json", "decorators": [], @@ -1124,6 +1155,7 @@ "$id": "157", "kind": "model", "name": "while", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.while", "usage": "Input,Json", "decorators": [], @@ -1160,6 +1192,7 @@ "$id": "162", "kind": "model", "name": "with", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.with", "usage": "Input,Json", "decorators": [], @@ -1196,6 +1229,7 @@ "$id": "167", "kind": "model", "name": "yield", + "clientNamespace": "SpecialWords.Models", "crossLanguageDefinitionId": "SpecialWords.Models.yield", "usage": "Input,Json", "decorators": [], @@ -1233,6 +1267,7 @@ { "$id": "172", "Name": "SpecialWordsClient", + "ClientNamespace": "SpecialWords", "Doc": "Scenarios to verify that reserved words can be used in service and generators will handle it appropriately.\n\nCurrent list of special words\n```txt\nand\nas\nassert\nasync\nawait\nbreak\nclass\nconstructor\ncontinue\ndef\ndel\nelif\nelse\nexcept\nexec\nfinally\nfor\nfrom\nglobal\nif\nimport\nin\nis\nlambda\nnot\nor\npass\nraise\nreturn\ntry\nwhile\nwith\nyield\n```", "Operations": [], "Protocol": { @@ -1275,7 +1310,8 @@ }, { "$id": "178", - "Name": "ModelsOps", + "Name": "Models", + "ClientNamespace": "SpecialWords.Models", "Doc": "Verify model names", "Operations": [ { @@ -3829,6 +3865,7 @@ { "$id": "382", "Name": "ModelProperties", + "ClientNamespace": "SpecialWords.ModelProperties", "Doc": "Verify model names", "Operations": [ { @@ -3950,6 +3987,7 @@ { "$id": "394", "Name": "Operations", + "ClientNamespace": "SpecialWords", "Doc": "Test reserved words as operation name.", "Operations": [ { @@ -4886,6 +4924,7 @@ { "$id": "466", "Name": "Parameters", + "ClientNamespace": "SpecialWords", "Doc": "Verify reserved words as parameter name.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/_Type._Array.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/Type.Array.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/_Type._Array.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/Type.Array.sln index a1b35e6bf2c..2f2ff2a5301 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/_Type._Array.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/Type.Array.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type._Array", "src\_Type._Array.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Array", "src\Type.Array.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..ffbef707f1e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type._Array +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..2099f82a951 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type._Array +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..c0aed936aec --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type._Array +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..29e9bf54a57 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type._Array +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/ModelValue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/ModelValue.cs index 7aae49a1457..7bb91fd90eb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/ModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/ModelValue.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using _Type._Array.Models; namespace _Type._Array { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.Serialization.cs index d17f8a216ff..3cc9f4546ed 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type._Array.Models +namespace _Type._Array { public partial class InnerModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.cs index 8ce7f6c177e..5379d9a9361 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/Models/InnerModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type._Array.Models +namespace _Type._Array { public partial class InnerModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/NullableModelValue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/NullableModelValue.cs index 0caabc37ce9..151edd9dea9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/NullableModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/NullableModelValue.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using _Type._Array.Models; namespace _Type._Array { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/TypeArrayModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/TypeArrayModelFactory.cs index 1c3e76948ac..17a112302a2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/TypeArrayModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Generated/TypeArrayModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type._Array.Models +namespace _Type._Array { public static partial class TypeArrayModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/_Type._Array.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Type.Array.csproj similarity index 65% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/_Type._Array.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Type.Array.csproj index 49cdb09198b..75cd1d1305d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/_Type._Array.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/src/Type.Array.csproj @@ -1,9 +1,9 @@ - This is the _Type._Array client library for developing .NET applications with rich experience. - SDK Code Generation _Type._Array + This is the Type.Array client library for developing .NET applications with rich experience. + SDK Code Generation Type.Array 1.0.0-beta.1 - _Type._Array + Type.Array netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/tspCodeModel.json index 19738b3bc15..e44271f4a62 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/array/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InnerModel", + "clientNamespace": "Type.Array", "crossLanguageDefinitionId": "Type.Array.InnerModel", "usage": "Input,Output,Json", "doc": "Array inner model", @@ -76,6 +77,7 @@ { "$id": "11", "Name": "ArrayClient", + "ClientNamespace": "Type.Array", "Doc": "Illustrates various types of arrays.", "Operations": [], "Protocol": { @@ -119,6 +121,7 @@ { "$id": "17", "Name": "Int32Value", + "ClientNamespace": "Type.Array", "Doc": "Array of int32 values", "Operations": [ { @@ -323,6 +326,7 @@ { "$id": "38", "Name": "Int64Value", + "ClientNamespace": "Type.Array", "Doc": "Array of int64 values", "Operations": [ { @@ -527,6 +531,7 @@ { "$id": "59", "Name": "BooleanValue", + "ClientNamespace": "Type.Array", "Doc": "Array of boolean values", "Operations": [ { @@ -731,6 +736,7 @@ { "$id": "80", "Name": "StringValue", + "ClientNamespace": "Type.Array", "Doc": "Array of string values", "Operations": [ { @@ -935,6 +941,7 @@ { "$id": "101", "Name": "Float32Value", + "ClientNamespace": "Type.Array", "Doc": "Array of float values", "Operations": [ { @@ -1139,6 +1146,7 @@ { "$id": "122", "Name": "DatetimeValue", + "ClientNamespace": "Type.Array", "Doc": "Array of datetime values", "Operations": [ { @@ -1359,6 +1367,7 @@ { "$id": "145", "Name": "DurationValue", + "ClientNamespace": "Type.Array", "Doc": "Array of duration values", "Operations": [ { @@ -1579,6 +1588,7 @@ { "$id": "168", "Name": "UnknownValue", + "ClientNamespace": "Type.Array", "Doc": "Array of unknown values", "Operations": [ { @@ -1783,6 +1793,7 @@ { "$id": "189", "Name": "ModelValue", + "ClientNamespace": "Type.Array", "Doc": "Array of model values", "Operations": [ { @@ -1979,6 +1990,7 @@ { "$id": "208", "Name": "NullableFloatValue", + "ClientNamespace": "Type.Array", "Doc": "Array of nullable float values", "Operations": [ { @@ -2034,7 +2046,8 @@ "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", "decorators": [] - } + }, + "clientNamespace": "" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -2183,6 +2196,7 @@ { "$id": "229", "Name": "NullableInt32Value", + "ClientNamespace": "Type.Array", "Doc": "Array of nullable int32 values", "Operations": [ { @@ -2238,7 +2252,8 @@ "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] - } + }, + "clientNamespace": "" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -2387,6 +2402,7 @@ { "$id": "250", "Name": "NullableBooleanValue", + "ClientNamespace": "Type.Array", "Doc": "Array of nullable boolean values", "Operations": [ { @@ -2442,7 +2458,8 @@ "name": "boolean", "crossLanguageDefinitionId": "TypeSpec.boolean", "decorators": [] - } + }, + "clientNamespace": "" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -2591,6 +2608,7 @@ { "$id": "271", "Name": "NullableStringValue", + "ClientNamespace": "Type.Array", "Doc": "Array of nullable string values", "Operations": [ { @@ -2646,7 +2664,8 @@ "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] - } + }, + "clientNamespace": "" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] @@ -2795,6 +2814,7 @@ { "$id": "292", "Name": "NullableModelValue", + "ClientNamespace": "Type.Array", "Doc": "Array of nullable model values", "Operations": [ { @@ -2846,7 +2866,8 @@ "kind": "nullable", "type": { "$ref": "2" - } + }, + "clientNamespace": "" }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/Client.Naming.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/Type.Dictionary.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/Client.Naming.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/Type.Dictionary.sln index 4fd4f6ff28b..06eb080afa7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/Client.Naming.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/Type.Dictionary.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Naming", "src\Client.Naming.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Dictionary", "src\Type.Dictionary.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..90dd6c3682b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Dictionary +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..486628a50de --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Dictionary +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..7ddd639e757 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Dictionary +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..799aa0826b9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Dictionary +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/ModelValue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/ModelValue.cs index bae8ed5f436..b2952152fff 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/ModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/ModelValue.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using _Type.Dictionary.Models; namespace _Type.Dictionary { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs index 840d49092f9..86e9193f5e1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Dictionary.Models +namespace _Type.Dictionary { public partial class InnerModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.cs index 344190493d4..5f7ad09a814 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/Models/InnerModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Dictionary.Models +namespace _Type.Dictionary { public partial class InnerModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/RecursiveModelValue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/RecursiveModelValue.cs index 2526a333beb..75e03a7904c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/RecursiveModelValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/RecursiveModelValue.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using _Type.Dictionary.Models; namespace _Type.Dictionary { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/TypeDictionaryModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/TypeDictionaryModelFactory.cs index fcaf62279b7..2ba9c53585d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/TypeDictionaryModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Generated/TypeDictionaryModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Dictionary.Models +namespace _Type.Dictionary { public static partial class TypeDictionaryModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Client.Naming.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Type.Dictionary.csproj similarity index 64% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Client.Naming.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Type.Dictionary.csproj index 53d5a5d43b5..6912235ff52 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/src/Client.Naming.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/Type.Dictionary.csproj @@ -1,9 +1,9 @@ - This is the Client.Naming client library for developing .NET applications with rich experience. - SDK Code Generation Client.Naming + This is the Type.Dictionary client library for developing .NET applications with rich experience. + SDK Code Generation Type.Dictionary 1.0.0-beta.1 - Client.Naming + Type.Dictionary netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/tspCodeModel.json index cd7758c7418..acb4f9864ef 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InnerModel", + "clientNamespace": "Type.Dictionary", "crossLanguageDefinitionId": "Type.Dictionary.InnerModel", "usage": "Input,Output,Json", "doc": "Dictionary inner model", @@ -81,6 +82,7 @@ { "$id": "12", "Name": "DictionaryClient", + "ClientNamespace": "Type.Dictionary", "Doc": "Illustrates various of dictionaries.", "Operations": [], "Protocol": { @@ -124,6 +126,7 @@ { "$id": "18", "Name": "Int32Value", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of int32 values", "Operations": [ { @@ -338,6 +341,7 @@ { "$id": "41", "Name": "Int64Value", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of int64 values", "Operations": [ { @@ -552,6 +556,7 @@ { "$id": "64", "Name": "BooleanValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of boolean values", "Operations": [ { @@ -766,6 +771,7 @@ { "$id": "87", "Name": "StringValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of string values", "Operations": [ { @@ -980,6 +986,7 @@ { "$id": "110", "Name": "Float32Value", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of float values", "Operations": [ { @@ -1194,6 +1201,7 @@ { "$id": "133", "Name": "DatetimeValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of datetime values", "Operations": [ { @@ -1424,6 +1432,7 @@ { "$id": "158", "Name": "DurationValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of duration values", "Operations": [ { @@ -1654,6 +1663,7 @@ { "$id": "183", "Name": "UnknownValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of unknown values", "Operations": [ { @@ -1868,6 +1878,7 @@ { "$id": "206", "Name": "ModelValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of model values", "Operations": [ { @@ -2074,6 +2085,7 @@ { "$id": "227", "Name": "RecursiveModelValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of model values", "Operations": [ { @@ -2280,6 +2292,7 @@ { "$id": "248", "Name": "NullableFloatValue", + "ClientNamespace": "Type.Dictionary", "Doc": "Dictionary of nullable float values", "Operations": [ { @@ -2341,7 +2354,8 @@ "name": "float32", "crossLanguageDefinitionId": "TypeSpec.float32", "decorators": [] - } + }, + "clientNamespace": "" }, "decorators": [] }, diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/Type.Enum.Extensible.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/Type.Enum.Extensible.sln index f112adf2f50..0c7290566c5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/Type.Enum.Extensible.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type._Enum.Fixed", "src\_Type._Enum.Fixed.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Enum.Extensible", "src\Type.Enum.Extensible.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..06b049860a3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Extensible +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..b7aff0c8d19 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Extensible +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..4a0683a3021 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Extensible +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..341fd02eb7e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Extensible +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Models/DaysOfWeekExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Models/DaysOfWeekExtensibleEnum.cs index 26b415558ca..167ca1e0635 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Models/DaysOfWeekExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/Models/DaysOfWeekExtensibleEnum.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type._Enum.Extensible.Models +namespace _Type._Enum.Extensible { public readonly partial struct DaysOfWeekExtensibleEnum : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/String.cs index ef9d25a807f..c4aadc25dce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Generated/String.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type._Enum.Extensible.Models; namespace _Type._Enum.Extensible { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Type.Enum.Extensible.csproj similarity index 63% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Type.Enum.Extensible.csproj index 6530006e880..3570786ef35 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/Type.Enum.Extensible.csproj @@ -1,9 +1,9 @@ - This is the _Type._Enum.Fixed client library for developing .NET applications with rich experience. - SDK Code Generation _Type._Enum.Fixed + This is the Type.Enum.Extensible client library for developing .NET applications with rich experience. + SDK Code Generation Type.Enum.Extensible 1.0.0-beta.1 - _Type._Enum.Fixed + Type.Enum.Extensible netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/tspCodeModel.json index 8cc09068b11..e4e982876de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/tspCodeModel.json @@ -143,6 +143,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Enum.Extensible", "doc": "Days of the week", "isFixed": false, "isFlags": false, @@ -155,6 +156,7 @@ { "$id": "18", "Name": "ExtensibleClient", + "ClientNamespace": "Type.Enum.Extensible", "Operations": [], "Protocol": { "$id": "19" @@ -197,6 +199,7 @@ { "$id": "24", "Name": "String", + "ClientNamespace": "Type.Enum.Extensible", "Operations": [ { "$id": "25", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Type.Enum.Fixed.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Type.Enum.Fixed.sln new file mode 100644 index 00000000000..2d78088650c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Type.Enum.Fixed.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Enum.Fixed", "src\Type.Enum.Fixed.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..2d7e1888995 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Fixed +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..babf11fe4ae --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Fixed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..f7cbd81e44c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Fixed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..1a8477913bc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type._Enum.Fixed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs index 5dc2116849e..3e394bd5bf8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type._Enum.Fixed.Models +namespace _Type._Enum.Fixed { public enum DaysOfWeekEnum { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs index 03ba5cafdf7..65c6edb1c24 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type._Enum.Fixed.Models; namespace _Type._Enum.Fixed { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Type.Enum.Fixed.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Type.Enum.Fixed.csproj new file mode 100644 index 00000000000..c1ff649d0e3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Type.Enum.Fixed.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Enum.Fixed client library for developing .NET applications with rich experience. + SDK Code Generation Type.Enum.Fixed + 1.0.0-beta.1 + Type.Enum.Fixed + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json index 3487706435a..a3a4e749c36 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json @@ -143,6 +143,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Enum.Fixed", "doc": "Days of the week", "isFixed": true, "isFlags": false, @@ -155,6 +156,7 @@ { "$id": "18", "Name": "FixedClient", + "ClientNamespace": "Type.Enum.Fixed", "Operations": [], "Protocol": { "$id": "19" @@ -197,6 +199,7 @@ { "$id": "24", "Name": "String", + "ClientNamespace": "Type.Enum.Fixed", "Operations": [ { "$id": "25", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/_Type.Dictionary.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/Type.Model.Empty.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/_Type.Dictionary.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/Type.Model.Empty.sln index f385fd11388..071b8de88de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/_Type.Dictionary.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/Type.Model.Empty.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Dictionary", "src\_Type.Dictionary.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Empty", "src\Type.Model.Empty.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln deleted file mode 100644 index 17bd1a5f3b5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Empty", "src\_Type.Model.Empty.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs index a6075f0ee98..70d8023048c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Empty.Models; namespace _Type.Model.Empty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..c82537bb802 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Empty +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..a7b1deddfda --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Empty +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..d651258ca13 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Empty +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..5ea2fae84f6 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Empty +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs index cabed4ec942..15181c7cd6a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyInput : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs index 7ea11d1c3ad..15adf73227f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyInput { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs index aebcc578b6e..c42f9caf13c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyInputOutput : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs index c96b81707c5..a55211028c8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyInputOutput { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs index 5e34ca9398e..8f93786754a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyOutput : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs index db49c4d6f4a..c52dfdb0147 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public partial class EmptyOutput { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs index 1f6e990e4a9..f87816bb061 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Empty.Models +namespace _Type.Model.Empty { public static partial class TypeModelEmptyModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/_Type.Dictionary.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Type.Model.Empty.csproj similarity index 74% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/_Type.Dictionary.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Type.Model.Empty.csproj index 69c172da798..c0b9774bdaf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/dictionary/src/_Type.Dictionary.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Type.Model.Empty.csproj @@ -1,9 +1,9 @@ - This is the _Type.Dictionary client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Dictionary + This is the Type.Model.Empty client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Empty 1.0.0-beta.1 - _Type.Dictionary + Type.Model.Empty netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj deleted file mode 100644 index bd7a5312be5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Empty client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Empty - 1.0.0-beta.1 - _Type.Model.Empty - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json index 293823d38fd..614df41678b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "EmptyInput", + "clientNamespace": "Type.Model.Empty", "crossLanguageDefinitionId": "Type.Model.Empty.EmptyInput", "usage": "Input,Json", "doc": "Empty model used in operation parameters", @@ -18,6 +19,7 @@ "$id": "3", "kind": "model", "name": "EmptyOutput", + "clientNamespace": "Type.Model.Empty", "crossLanguageDefinitionId": "Type.Model.Empty.EmptyOutput", "usage": "Output,Json", "doc": "Empty model used in operation return type", @@ -28,6 +30,7 @@ "$id": "4", "kind": "model", "name": "EmptyInputOutput", + "clientNamespace": "Type.Model.Empty", "crossLanguageDefinitionId": "Type.Model.Empty.EmptyInputOutput", "usage": "Input,Output,Json", "doc": "Empty model used in both parameter and return type", @@ -39,6 +42,7 @@ { "$id": "5", "Name": "EmptyClient", + "ClientNamespace": "Type.Model.Empty", "Doc": "Illustrates usage of empty model used in operation's parameters and responses.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln new file mode 100644 index 00000000000..e6158a0fb39 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/Type.Model.Inheritance.EnumDiscriminator.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.EnumDiscriminator", "src\Type.Model.Inheritance.EnumDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/_Type.Model.Inheritance.EnumDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/_Type.Model.Inheritance.EnumDiscriminator.sln deleted file mode 100644 index 17fd8ff6aa5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/_Type.Model.Inheritance.EnumDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.EnumDiscriminator", "src\_Type.Model.Inheritance.EnumDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs index 0fb262b7f9c..2eec9f2f047 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/EnumDiscriminatorClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Inheritance.EnumDiscriminator.Models; namespace _Type.Model.Inheritance.EnumDiscriminator { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..204d86ce4b9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.EnumDiscriminator +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..26497ef9a8d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.EnumDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0882b8aeeb8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.EnumDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..a2484fcf118 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.EnumDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs index 91abacafd31..5d8c4636e9a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public partial class Cobra : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.cs index b1045053929..8784dc8f090 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Cobra.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public partial class Cobra : Snake { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs index 436ecb03e44..e8ee0e9e3cb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { [PersistableModelProxy(typeof(UnknownDog))] public abstract partial class Dog : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.cs index 81e900e610e..fe264688810 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Dog.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public abstract partial class Dog { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/DogKind.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/DogKind.cs index f306213a08e..1c355e2613f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/DogKind.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/DogKind.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal readonly partial struct DogKind : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs index 71b4e05c9e0..a298e3e254e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public partial class Golden : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.cs index 476e7ca2ca9..86dc02a3d0d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Golden.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public partial class Golden : Dog { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs index 8646e346a0e..d8adff999f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { [PersistableModelProxy(typeof(UnknownSnake))] public abstract partial class Snake : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.cs index bd6128d514b..8e63284fd05 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/Snake.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public abstract partial class Snake { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/SnakeKind.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/SnakeKind.cs index bf3c27715a9..351935ee0ca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/SnakeKind.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/SnakeKind.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal enum SnakeKind { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs index 1e03dd580aa..276cdf995ed 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal partial class UnknownDog : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.cs index 58dbd4b6666..95ede360ea7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownDog.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal partial class UnknownDog : Dog { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs index a50a78fbf18..e5e81eb8eda 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal partial class UnknownSnake : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.cs index 4d16468c354..e0837c9384c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/Models/UnknownSnake.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { internal partial class UnknownSnake : Snake { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/TypeModelInheritanceEnumDiscriminatorModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/TypeModelInheritanceEnumDiscriminatorModelFactory.cs index 61e50b74d3a..f7d08ddf4e7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/TypeModelInheritanceEnumDiscriminatorModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Generated/TypeModelInheritanceEnumDiscriminatorModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Inheritance.EnumDiscriminator.Models +namespace _Type.Model.Inheritance.EnumDiscriminator { public static partial class TypeModelInheritanceEnumDiscriminatorModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj similarity index 62% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj index f736e4d8d9d..c57b0c873d0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj @@ -1,9 +1,9 @@ - This is the _Type.Model.Inheritance.NotDiscriminated client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Inheritance.NotDiscriminated + This is the Type.Model.Inheritance.EnumDiscriminator client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Inheritance.EnumDiscriminator 1.0.0-beta.1 - _Type.Model.Inheritance.NotDiscriminated + Type.Model.Inheritance.EnumDiscriminator netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/_Type.Model.Inheritance.EnumDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/_Type.Model.Inheritance.EnumDiscriminator.csproj deleted file mode 100644 index b7372db1c1b..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/src/_Type.Model.Inheritance.EnumDiscriminator.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Inheritance.EnumDiscriminator client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Inheritance.EnumDiscriminator - 1.0.0-beta.1 - _Type.Model.Inheritance.EnumDiscriminator - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/tspCodeModel.json index d1a0a9478f0..1b8d78fef5b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/enum-discriminator/tspCodeModel.json @@ -35,6 +35,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "doc": "extensible enum type for discriminator", "isFixed": false, "isFlags": false, @@ -73,6 +74,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "doc": "fixed enum type for discriminator", "isFixed": true, "isFlags": false, @@ -85,6 +87,7 @@ "$id": "10", "kind": "model", "name": "Dog", + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.Dog", "usage": "Input,Output,Json", "doc": "Test extensible enum type for discriminator", @@ -150,6 +153,7 @@ "$id": "19", "kind": "model", "name": "Golden", + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.Golden", "usage": "Input,Output,Json", "doc": "Golden dog model", @@ -203,6 +207,7 @@ "$id": "25", "kind": "model", "name": "Snake", + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.Snake", "usage": "Input,Output,Json", "doc": "Test fixed enum type for discriminator", @@ -268,6 +273,7 @@ "$id": "34", "kind": "model", "name": "Cobra", + "clientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.EnumDiscriminator.Cobra", "usage": "Input,Output,Json", "doc": "Cobra model", @@ -322,6 +328,7 @@ { "$id": "40", "Name": "EnumDiscriminatorClient", + "ClientNamespace": "Type.Model.Inheritance.EnumDiscriminator", "Doc": "Illustrates inheritance with enum discriminator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln new file mode 100644 index 00000000000..ad6c801a052 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Type.Model.Inheritance.NestedDiscriminator.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.NestedDiscriminator", "src\Type.Model.Inheritance.NestedDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln deleted file mode 100644 index f2da00137e4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NestedDiscriminator", "src\_Type.Model.Inheritance.NestedDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..3ca759ff341 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NestedDiscriminator +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..9224d83461e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NestedDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..5bc094d9af7 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NestedDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..c192c089eca --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NestedDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs index 2696a151d92..1a61647829a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { [PersistableModelProxy(typeof(UnknownFish))] public abstract partial class Fish : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs index 2c6ade3928a..03ca6ae983c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public abstract partial class Fish { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs index 84d5d3f6485..0643256ca9a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class GoblinShark : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs index 9f90788cafd..9fdf9606e00 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class GoblinShark : Shark { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs index b7247054ad5..54bb75f1b6f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class Salmon : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs index a0125e6dee0..ba9df9d0f97 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class Salmon : Fish { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs index 42c0af1c5a1..d5fd3307ecd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class SawShark : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs index 241639538c7..a922755c6d2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class SawShark : Shark { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs index 4d07b4c9eda..a8350ff9631 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class Shark : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs index b0c81bf7f29..7dcc1fbbe56 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public partial class Shark : Fish { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs index 1184b8cf35c..1d23d73b652 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { internal partial class UnknownFish : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs index c9f141111e6..f749a7f39f1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { internal partial class UnknownFish : Fish { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs index 6597feed291..fda8b2d8e43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { internal partial class UnknownShark : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs index 8f051eb4fb3..05fc30031be 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { internal partial class UnknownShark : Shark { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs index 5bc2d771b95..677ad5ba4f3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Inheritance.NestedDiscriminator.Models; namespace _Type.Model.Inheritance.NestedDiscriminator { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs index d638c221821..71a05ab2633 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Inheritance.NestedDiscriminator.Models +namespace _Type.Model.Inheritance.NestedDiscriminator { public static partial class TypeModelInheritanceNestedDiscriminatorModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj new file mode 100644 index 00000000000..c2504b6a77b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Inheritance.NestedDiscriminator client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Inheritance.NestedDiscriminator + 1.0.0-beta.1 + Type.Model.Inheritance.NestedDiscriminator + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj deleted file mode 100644 index 552d6ba5c0e..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Inheritance.NestedDiscriminator client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Inheritance.NestedDiscriminator - 1.0.0-beta.1 - _Type.Model.Inheritance.NestedDiscriminator - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json index f34725acf28..86f8208f55b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "Fish", + "clientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.Fish", "usage": "Input,Output,Json", "doc": "This is base model for polymorphic multiple levels inheritance with a discriminator.", @@ -76,6 +77,7 @@ "$id": "12", "kind": "model", "name": "Shark", + "clientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.Shark", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic multiple levels inheritance and it defines a new discriminator.", @@ -153,6 +155,7 @@ "$id": "23", "kind": "model", "name": "SawShark", + "clientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.SawShark", "usage": "Input,Output,Json", "doc": "The third level model SawShark in polymorphic multiple levels inheritance.", @@ -200,6 +203,7 @@ "$id": "29", "kind": "model", "name": "GoblinShark", + "clientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.GoblinShark", "usage": "Input,Output,Json", "doc": "The third level model GoblinShark in polymorphic multiple levels inheritance.", @@ -249,6 +253,7 @@ "$id": "35", "kind": "model", "name": "Salmon", + "clientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.NestedDiscriminator.Salmon", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic multiple levels inheritance which contains references to other polymorphic instances.", @@ -396,6 +401,7 @@ { "$id": "53", "Name": "NestedDiscriminatorClient", + "ClientNamespace": "Type.Model.Inheritance.NestedDiscriminator", "Doc": "Illustrates multiple level inheritance with multiple discriminators.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln new file mode 100644 index 00000000000..152e50eb068 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Type.Model.Inheritance.NotDiscriminated.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.NotDiscriminated", "src\Type.Model.Inheritance.NotDiscriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln deleted file mode 100644 index 0d836d5ba4a..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NotDiscriminated", "src\_Type.Model.Inheritance.NotDiscriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..200caa50716 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NotDiscriminated +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..c587ddbdf50 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NotDiscriminated +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..ec9ee4e2820 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NotDiscriminated +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..5770e6d0e10 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.NotDiscriminated +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs index 5008a42ee9b..a665630b7f5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Cat : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs index 757333c3da3..f6955f3eff0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Cat : Pet { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs index 9e5779bbf00..ca94bf26299 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Pet : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs index 34d9b58e505..917d9a1cb16 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Pet { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs index 4b46e81f33e..20c9211416e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Siamese : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs index 98bb473c7c8..6bc6d131fde 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public partial class Siamese : Cat { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs index fd6cef19cba..e573655283f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Inheritance.NotDiscriminated.Models; namespace _Type.Model.Inheritance.NotDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs index 4320399e705..ef41b756aa1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Inheritance.NotDiscriminated.Models +namespace _Type.Model.Inheritance.NotDiscriminated { public static partial class TypeModelInheritanceNotDiscriminatedModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj new file mode 100644 index 00000000000..2351071f6b5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Inheritance.NotDiscriminated client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Inheritance.NotDiscriminated + 1.0.0-beta.1 + Type.Model.Inheritance.NotDiscriminated + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json index 37914e95d76..cc4fcfa00a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "Siamese", + "clientNamespace": "Type.Model.Inheritance.NotDiscriminated", "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.Siamese", "usage": "Input,Output,Json", "doc": "The third level model in the normal multiple levels inheritance.", @@ -16,6 +17,7 @@ "$id": "3", "kind": "model", "name": "Cat", + "clientNamespace": "Type.Model.Inheritance.NotDiscriminated", "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.Cat", "usage": "Input,Output,Json", "doc": "The second level model in the normal multiple levels inheritance.", @@ -24,6 +26,7 @@ "$id": "4", "kind": "model", "name": "Pet", + "clientNamespace": "Type.Model.Inheritance.NotDiscriminated", "crossLanguageDefinitionId": "Type.Model.Inheritance.NotDiscriminated.Pet", "usage": "Input,Output,Json", "doc": "This is base model for not-discriminated normal multiple levels inheritance.", @@ -126,6 +129,7 @@ { "$id": "17", "Name": "NotDiscriminatedClient", + "ClientNamespace": "Type.Model.Inheritance.NotDiscriminated", "Doc": "Illustrates not-discriminated inheritance model.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln new file mode 100644 index 00000000000..36c2af38e7a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Type.Model.Inheritance.Recursive.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.Recursive", "src\Type.Model.Inheritance.Recursive.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln deleted file mode 100644 index 201e3c0b6a5..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.Recursive", "src\_Type.Model.Inheritance.Recursive.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..bcbe9dbe46a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.Recursive +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..499d391d85d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.Recursive +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6d705caec18 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.Recursive +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6f53bf62720 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.Recursive +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs index ba1474537c7..de1047ed31d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.Recursive.Models +namespace _Type.Model.Inheritance.Recursive { public partial class Element : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs index 9a679f5417c..3227edf0802 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.Recursive.Models +namespace _Type.Model.Inheritance.Recursive { public partial class Element { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs index 1b051a06776..65632d1d14d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.Recursive.Models +namespace _Type.Model.Inheritance.Recursive { public partial class Extension : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs index d52a7788936..58e5bcfcc8d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.Recursive.Models +namespace _Type.Model.Inheritance.Recursive { public partial class Extension : Element { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs index e5e8fd0ed4d..50140c50d04 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Inheritance.Recursive.Models; namespace _Type.Model.Inheritance.Recursive { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs index 3015ee39ffa..7f3a2cf1abf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Inheritance.Recursive.Models +namespace _Type.Model.Inheritance.Recursive { public static partial class TypeModelInheritanceRecursiveModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj new file mode 100644 index 00000000000..2fe324d0ab0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Inheritance.Recursive client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Inheritance.Recursive + 1.0.0-beta.1 + Type.Model.Inheritance.Recursive + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj deleted file mode 100644 index 3dbce589f5e..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Inheritance.Recursive client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Inheritance.Recursive - 1.0.0-beta.1 - _Type.Model.Inheritance.Recursive - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json index f1bae5dab1d..5b99c3955fa 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "Extension", + "clientNamespace": "Type.Model.Inheritance.Recursive", "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.Extension", "usage": "Input,Output,Json", "doc": "extension", @@ -16,6 +17,7 @@ "$id": "3", "kind": "model", "name": "Element", + "clientNamespace": "Type.Model.Inheritance.Recursive", "crossLanguageDefinitionId": "Type.Model.Inheritance.Recursive.Element", "usage": "Input,Output,Json", "doc": "element", @@ -89,6 +91,7 @@ { "$id": "12", "Name": "RecursiveClient", + "ClientNamespace": "Type.Model.Inheritance.Recursive", "Doc": "Illustrates inheritance recursion", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln new file mode 100644 index 00000000000..17c455fe964 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Type.Model.Inheritance.SingleDiscriminator.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Inheritance.SingleDiscriminator", "src\Type.Model.Inheritance.SingleDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln deleted file mode 100644 index 2b18f8ccc42..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.SingleDiscriminator", "src\_Type.Model.Inheritance.SingleDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..d85ce975248 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.SingleDiscriminator +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..65f90158aa3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.SingleDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..83013b7fadc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.SingleDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..c0d813e79fc --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Inheritance.SingleDiscriminator +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs index 0a64984c49c..6c42bb8ef5b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { [PersistableModelProxy(typeof(UnknownBird))] public abstract partial class Bird : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs index 63a9836fc06..9c3da3c7e79 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public abstract partial class Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs index 00e2d59c282..0de63b16c61 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { [PersistableModelProxy(typeof(UnknownDinosaur))] public abstract partial class Dinosaur : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs index 075d4ab7f08..13c3bfa165e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public abstract partial class Dinosaur { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs index 6bf1481a5f5..c48eeec696c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Eagle : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs index 677a9bc7e7e..157a75ac950 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Eagle : Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs index 5da88ad2484..c41d6140d29 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Goose : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs index b7566c1c5a9..bcdae2c174c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Goose : Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs index 425d4252dd8..ee96f8f1b59 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class SeaGull : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs index e1ea514da5d..05857207fc9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class SeaGull : Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs index 9874e2b982d..55fcccca027 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Sparrow : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs index d390daf44e0..1e29cd2b9e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class Sparrow : Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs index e1a18a42e1c..04397ebbdf8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class TRex : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs index d3c45304c41..c9fa8acfe68 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public partial class TRex : Dinosaur { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs index e451dbd3b1b..1c7afe4770f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { internal partial class UnknownBird : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs index c8f27a87b9b..796bde39923 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { internal partial class UnknownBird : Bird { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs index ef8e0159b8e..e649daaaf9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { internal partial class UnknownDinosaur : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs index f338aa82acd..3e296ce661e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { internal partial class UnknownDinosaur : Dinosaur { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs index 15e73e5f864..261b93c7665 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Inheritance.SingleDiscriminator.Models; namespace _Type.Model.Inheritance.SingleDiscriminator { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs index db5f8c103c1..a76389a6425 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Inheritance.SingleDiscriminator.Models +namespace _Type.Model.Inheritance.SingleDiscriminator { public static partial class TypeModelInheritanceSingleDiscriminatorModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj new file mode 100644 index 00000000000..a99632ce709 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Inheritance.SingleDiscriminator client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Inheritance.SingleDiscriminator + 1.0.0-beta.1 + Type.Model.Inheritance.SingleDiscriminator + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj deleted file mode 100644 index 6e44f455de4..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Inheritance.SingleDiscriminator client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Inheritance.SingleDiscriminator - 1.0.0-beta.1 - _Type.Model.Inheritance.SingleDiscriminator - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json index aed2b99e22a..61d81657833 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "Bird", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.Bird", "usage": "Input,Output,Json", "doc": "This is base model for polymorphic single level inheritance with a discriminator.", @@ -75,6 +76,7 @@ "$id": "12", "kind": "model", "name": "SeaGull", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.SeaGull", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic single level inheritance.", @@ -122,6 +124,7 @@ "$id": "18", "kind": "model", "name": "Sparrow", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.Sparrow", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic single level inheritance.", @@ -169,6 +172,7 @@ "$id": "24", "kind": "model", "name": "Goose", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.Goose", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic single level inheritance.", @@ -216,6 +220,7 @@ "$id": "30", "kind": "model", "name": "Eagle", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.Eagle", "usage": "Input,Output,Json", "doc": "The second level model in polymorphic single levels inheritance which contains references to other polymorphic instances.", @@ -362,6 +367,7 @@ "$id": "48", "kind": "model", "name": "Dinosaur", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.Dinosaur", "usage": "Output,Json", "doc": "Define a base class in the legacy way. Discriminator property is not explicitly defined in the model.", @@ -430,6 +436,7 @@ "$id": "58", "kind": "model", "name": "TRex", + "clientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "crossLanguageDefinitionId": "Type.Model.Inheritance.SingleDiscriminator.TRex", "usage": "Output,Json", "doc": "The second level legacy model in polymorphic single level inheritance.", @@ -483,6 +490,7 @@ { "$id": "64", "Name": "SingleDiscriminatorClient", + "ClientNamespace": "Type.Model.Inheritance.SingleDiscriminator", "Doc": "Illustrates inheritance with single discriminator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Type.Model.Usage.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Type.Model.Usage.sln new file mode 100644 index 00000000000..81ecdf5e296 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Type.Model.Usage.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Usage", "src\Type.Model.Usage.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln deleted file mode 100644 index cac29069616..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Usage", "src\_Type.Model.Usage.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..e4ab6495c9e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Usage +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..6a678c026c3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Usage +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..ef237204dfb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Usage +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6aa562b1269 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Usage +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs index f6ffd07b05c..97e52b4ffdd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class InputOutputRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs index 7d32ed68c68..1aac054f001 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class InputOutputRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs index ca30dfbb338..1e0ed446c34 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class InputRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs index 8bb4d849812..aa1c9d6cd43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class InputRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs index cdef8375f20..81448e2aa9f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class OutputRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs index 3427513e379..9da1535e946 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public partial class OutputRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs index 68217d7ac55..da7f6114d87 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Model.Usage.Models +namespace _Type.Model.Usage { public static partial class TypeModelUsageModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs index 1e9687b46a9..cd3f6b4c23d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Usage.Models; namespace _Type.Model.Usage { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Type.Model.Usage.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Type.Model.Usage.csproj new file mode 100644 index 00000000000..7b49558ecea --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Type.Model.Usage.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Usage client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Usage + 1.0.0-beta.1 + Type.Model.Usage + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj deleted file mode 100644 index 76cbabc3c2d..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Model.Usage client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Usage - 1.0.0-beta.1 - _Type.Model.Usage - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json index 14a3a21249b..81a5a9b3302 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "InputRecord", + "clientNamespace": "Type.Model.Usage", "crossLanguageDefinitionId": "Type.Model.Usage.InputRecord", "usage": "Input,Json", "doc": "Record used in operation parameters", @@ -45,6 +46,7 @@ "$id": "7", "kind": "model", "name": "OutputRecord", + "clientNamespace": "Type.Model.Usage", "crossLanguageDefinitionId": "Type.Model.Usage.OutputRecord", "usage": "Output,Json", "doc": "Record used in operation return type", @@ -82,6 +84,7 @@ "$id": "12", "kind": "model", "name": "InputOutputRecord", + "clientNamespace": "Type.Model.Usage", "crossLanguageDefinitionId": "Type.Model.Usage.InputOutputRecord", "usage": "Input,Output,Json", "doc": "Record used both as operation parameter and return type", @@ -120,6 +123,7 @@ { "$id": "17", "Name": "UsageClient", + "ClientNamespace": "Type.Model.Usage", "Doc": "Illustrates usage of Record in different places(Operation parameters, return type or both).", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Type.Model.Visibility.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Type.Model.Visibility.sln new file mode 100644 index 00000000000..25aeb16a6cf --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Type.Model.Visibility.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Model.Visibility", "src\Type.Model.Visibility.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..0472bc84f7a --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Visibility +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..40097e98e26 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Visibility +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..3200aae6735 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Visibility +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4903fa04593 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Model.Visibility +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs index cb6eda5a247..1abf3f920fb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Visibility.Models +namespace _Type.Model.Visibility { public partial class ReadOnlyModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs index 5aaf297abcf..1ed4d6ae5e2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Visibility.Models +namespace _Type.Model.Visibility { public partial class ReadOnlyModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs index 12af258d636..c930c756f03 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Model.Visibility.Models +namespace _Type.Model.Visibility { public partial class VisibilityModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs index 03976b2b55e..0cdf6f0a525 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Visibility.Models +namespace _Type.Model.Visibility { public partial class VisibilityModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs index 528ac48eb4b..efd7b6035ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Model.Visibility.Models +namespace _Type.Model.Visibility { public static partial class TypeModelVisibilityModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs index f5c6e7f27b2..24cd40e3aa3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Model.Visibility.Models; namespace _Type.Model.Visibility { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Type.Model.Visibility.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Type.Model.Visibility.csproj new file mode 100644 index 00000000000..9895d80b664 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Type.Model.Visibility.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Model.Visibility client library for developing .NET applications with rich experience. + SDK Code Generation Type.Model.Visibility + 1.0.0-beta.1 + Type.Model.Visibility + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json index 7c3965512e1..8168adc9406 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "VisibilityModel", + "clientNamespace": "Type.Model.Visibility", "crossLanguageDefinitionId": "Type.Model.Visibility.VisibilityModel", "usage": "Input,Output,Json", "doc": "Output model with visibility properties.", @@ -168,6 +169,7 @@ "$id": "25", "kind": "model", "name": "ReadOnlyModel", + "clientNamespace": "Type.Model.Visibility", "crossLanguageDefinitionId": "Type.Model.Visibility.ReadOnlyModel", "usage": "Input,Output,Json", "doc": "RoundTrip model with readonly optional properties.", @@ -195,7 +197,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": true, "readOnly": true, @@ -257,6 +260,7 @@ { "$id": "38", "Name": "VisibilityClient", + "ClientNamespace": "Type.Model.Visibility", "Doc": "Illustrates models with visibility properties.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln new file mode 100644 index 00000000000..f2363e42afa --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/Type.Property.AdditionalProperties.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.AdditionalProperties", "src\Type.Property.AdditionalProperties.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/_Type.Property.AdditionalProperties.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/_Type.Property.AdditionalProperties.sln deleted file mode 100644 index fd3a463cf03..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/_Type.Property.AdditionalProperties.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.AdditionalProperties", "src\_Type.Property.AdditionalProperties.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs index 6ddeb10c363..3711caec903 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadFloat.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs index 149d68643f0..16952422f03 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs index 842983aeeee..cafdfaa177b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadModelArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs index 4500baa0fa5..14de43be0c4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsDifferentSpreadString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs index f5c991644bd..db8c90aa883 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsFloat.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModel.cs index 8be28cbddbd..fc3605496dc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs index fc91f140660..9fac072dc49 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsModelArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsString.cs index fd57374bb03..25a8bce5e84 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs index a56f77368e8..3beb5baea3f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknown.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs index dff5553044f..1ba9e2819a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDerived.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs index 892863d04cd..dddd20125ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/ExtendsUnknownDiscriminated.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..41bd90a35f1 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.AdditionalProperties +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..0829bc05b81 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.AdditionalProperties +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..db37cc07336 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.AdditionalProperties +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..a5cb0ff643b --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.AdditionalProperties +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsFloat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsFloat.cs index e5091bc5f00..74284e4cd58 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsFloat.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModel.cs index 58afa817c65..035ee852f98 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModelArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModelArray.cs index ae5b723c374..cb2785116e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsModelArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsString.cs index 74dbd82b942..6281cebe5bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknown.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknown.cs index fa026e59429..756f70c38ba 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknown.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknown.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs index 05a05af7c3f..c60981109bc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDerived.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs index 47352eb913b..3686c8c898c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/IsUnknownDiscriminated.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs index b0a49fa9ede..e9f280a6941 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadFloatDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.cs index 9354c9732b1..5d49723e00b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadFloatDerived : DifferentSpreadFloatRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs index 827fd458614..70b516a1bb1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadFloatRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.cs index 3f04980eb82..332e0cea5cf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadFloatRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadFloatRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs index eba846fcd7d..656cb623ac6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelArrayDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.cs index e05b6ec71ee..9a2e4fce5b8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelArrayDerived : DifferentSpreadModelArrayRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs index 4e8fe7dbbb0..11d711deacf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelArrayRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.cs index 82e51a5a4ef..021e3e786df 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelArrayRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelArrayRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs index d095072e358..432f1202199 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.cs index 734a84e27ba..27aa71019d7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelDerived : DifferentSpreadModelRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs index 07710bb747f..553473ef31e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.cs index d61c6f90570..a937e5469d2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadModelRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadModelRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs index 23e0aadbd6e..5b281f84aa9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadStringDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.cs index c2eb7e9042c..2a2f6649ab2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadStringDerived : DifferentSpreadStringRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs index 36e97e31f80..75564818b72 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadStringRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.cs index b52445c0e4e..e42a1aa1787 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/DifferentSpreadStringRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class DifferentSpreadStringRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs index 1312932b114..f0d4f361ba4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsFloatAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.cs index b42219b1b8e..abbeb722fd5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsFloatAdditionalProperties.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsFloatAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs index 311d17e1f4a..3b02b6b2bf9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsModelAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.cs index ba5112cf142..dd4fb206fcc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsModelAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs index 2e699e29356..1ead7fb12cf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsModelArrayAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.cs index c3a4ba46d03..db7b8d7c70a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsModelArrayAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs index a5b0549642e..8c53ff37ee9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsStringAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.cs index 7a2c7386794..49e01fd5fb2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsStringAdditionalProperties.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsStringAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs index f897b978596..36c9c670244 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.cs index b64d01125c1..ad77267bdf9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs index e016fb0212d..08b8f6ddf95 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalPropertiesDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.cs index dc371623183..8747439c555 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalPropertiesDerived : ExtendsUnknownAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index 797a92f2476..f56ea7ab399 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { [PersistableModelProxy(typeof(UnknownExtendsUnknownAdditionalPropertiesDiscriminated))] public abstract partial class ExtendsUnknownAdditionalPropertiesDiscriminated : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.cs index 14fdde794ce..030fa6f01ac 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminated.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public abstract partial class ExtendsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs index c7183b340b9..9f687d2550d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalPropertiesDiscriminatedDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.cs index 8947fa44959..2e1d2cda9f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ExtendsUnknownAdditionalPropertiesDiscriminatedDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ExtendsUnknownAdditionalPropertiesDiscriminatedDerived : ExtendsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs index 27417079655..71fa69f36e4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsFloatAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.cs index 36da6b17189..8f8581eb0d3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsFloatAdditionalProperties.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsFloatAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs index 0c379dd6d4a..3830da42cac 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsModelAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.cs index 29c5d59cdc4..e8c9c0379ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsModelAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs index 307cb3446b9..8c93bd5f727 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsModelArrayAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.cs index 47501816cbd..38fb1149abf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsModelArrayAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs index 8e294b66162..59784dbf0ad 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsStringAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.cs index f03cd721fa4..a00aa916208 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsStringAdditionalProperties.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsStringAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs index aaf4bbea46c..d6015b7e432 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalProperties : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.cs index 0c3cd035748..8cc61b5192a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs index bb6628a9a17..a1e8074aac8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalPropertiesDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.cs index da27559e7ca..81fe43d91e0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalPropertiesDerived : IsUnknownAdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index c778c1d8dd1..60d7e740044 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { [PersistableModelProxy(typeof(UnknownIsUnknownAdditionalPropertiesDiscriminated))] public abstract partial class IsUnknownAdditionalPropertiesDiscriminated : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.cs index 45bdbf98167..43179b05813 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminated.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public abstract partial class IsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs index c7b1ffafdce..46236090bb7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalPropertiesDiscriminatedDerived : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.cs index bc057c22c50..7372a12a81c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/IsUnknownAdditionalPropertiesDiscriminatedDerived.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class IsUnknownAdditionalPropertiesDiscriminatedDerived : IsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs index 06a4dff678b..0df7e8bded4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ModelForRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.cs index 9087e404da9..23640a5ebae 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/ModelForRecord.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class ModelForRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs index e66f35a02c0..6c7b94475d5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class MultipleSpreadRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.cs index 4045183c010..59db4fe63db 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/MultipleSpreadRecord.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class MultipleSpreadRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs index 19d4a9e0e39..8067f4960af 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadFloatRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.cs index a39b74546ae..32ce3a25613 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadFloatRecord.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadFloatRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs index 2d2799ba839..fd5a006c4a7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadModelArrayRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.cs index 813ae40494c..701aff79078 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelArrayRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadModelArrayRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs index 527d7bfc2cc..65b99992e59 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadModelRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.cs index b41f0734ac3..0534db85a1e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadModelRecord.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadModelRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.Serialization.cs index 9f28ca29abf..29b3dfa60b0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForDiscriminatedUnion : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.cs index 6a12d4671ad..4f15aedabea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForDiscriminatedUnion.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForDiscriminatedUnion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs index a684397a80b..7fa4a2c95b4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.cs index ed32dfcf550..f4dbb2e5c35 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs index 7de388fb9ad..a305f093b6e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.cs index 883e086114d..74c65320192 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion2.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs index b9317e493a3..84d32996f4b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion3 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.cs index 81c3e4e6980..693d6d68547 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForNonDiscriminatedUnion3.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForNonDiscriminatedUnion3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs index 15175403909..47c900de4f7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForUnion : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.cs index 1c09d0aba2b..0afcddfbe47 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadRecordForUnion.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadRecordForUnion { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs index 8faabcfab0c..5f20c238477 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadStringRecord : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.cs index 6303c105d5f..8d0cf0ef2ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/SpreadStringRecord.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class SpreadStringRecord { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index b040f20f569..b4cdf33d2b6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { internal partial class UnknownExtendsUnknownAdditionalPropertiesDiscriminated : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.cs index 016ce89325c..e159a1ea2c6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownExtendsUnknownAdditionalPropertiesDiscriminated.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { internal partial class UnknownExtendsUnknownAdditionalPropertiesDiscriminated : ExtendsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs index 5fa7ee9751d..936c0361d77 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.Serialization.cs @@ -6,7 +6,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { internal partial class UnknownIsUnknownAdditionalPropertiesDiscriminated : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.cs index 6f03c7dc8d1..4d2fff08870 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/UnknownIsUnknownAdditionalPropertiesDiscriminated.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { internal partial class UnknownIsUnknownAdditionalPropertiesDiscriminated : IsUnknownAdditionalPropertiesDiscriminated { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs index e4211133577..a334045a160 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData0 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.cs index 9b6c6e19d43..871fcc0710f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData0 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0Kind.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0Kind.cs index 245ca9d7ef0..3b0e28b2c32 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0Kind.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData0Kind.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public readonly partial struct WidgetData0Kind : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs index 8237422e936..27e348fedb4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.cs index 688adec2189..c5e3a8e7208 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1Kind.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1Kind.cs index ad7e0760919..b1b3ad2dbf6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1Kind.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData1Kind.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public readonly partial struct WidgetData1Kind : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs index cfd5bb5eda7..4e22a85c9d5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.cs index 1867e878912..bc5ef7eb13d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public partial class WidgetData2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2Kind.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2Kind.cs index c2367974149..ead4451a4e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2Kind.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/Models/WidgetData2Kind.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public readonly partial struct WidgetData2Kind : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/MultipleSpread.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/MultipleSpread.cs index 10ae6e3d1b7..9b081a1a362 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/MultipleSpread.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/MultipleSpread.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs index b45a0adf2e7..f86ae0c3e6e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentFloat.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs index 7a4828d7a26..0ba5c6d4854 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs index 0929a2387eb..0d1cd493e84 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentModelArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs index f59f19462f0..d990d8ba2c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadDifferentString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadFloat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadFloat.cs index 2082be364c4..a97ea7ff831 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadFloat.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModel.cs index b3ec8e78611..3db2515a716 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs index d8277d84e7b..aec0c659e11 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadModelArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordDiscriminatedUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordDiscriminatedUnion.cs index 8439f723200..e3f9acbc6b4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordDiscriminatedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordDiscriminatedUnion.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs index 9c2ab2bc547..89de049334c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs index 78fa7418d62..e78b2929cd9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion2.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs index 553ca1e7535..ecb9285fa4e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordNonDiscriminatedUnion3.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs index 433981d443e..7cc11db7439 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadRecordUnion.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadString.cs index 1fff54b1f7a..2c4d33288de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/SpreadString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.AdditionalProperties.Models; namespace _Type.Property.AdditionalProperties { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/TypePropertyAdditionalPropertiesModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/TypePropertyAdditionalPropertiesModelFactory.cs index 48491da082f..471396fc965 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/TypePropertyAdditionalPropertiesModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Generated/TypePropertyAdditionalPropertiesModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.AdditionalProperties.Models +namespace _Type.Property.AdditionalProperties { public static partial class TypePropertyAdditionalPropertiesModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj new file mode 100644 index 00000000000..817390178c2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Property.AdditionalProperties client library for developing .NET applications with rich experience. + SDK Code Generation Type.Property.AdditionalProperties + 1.0.0-beta.1 + Type.Property.AdditionalProperties + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/_Type.Property.AdditionalProperties.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/_Type.Property.AdditionalProperties.csproj deleted file mode 100644 index a66982eff26..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/src/_Type.Property.AdditionalProperties.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Property.AdditionalProperties client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Property.AdditionalProperties - 1.0.0-beta.1 - _Type.Property.AdditionalProperties - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/tspCodeModel.json index dc18d58d27b..4d2cdb35320 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/additional-properties/tspCodeModel.json @@ -30,6 +30,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.AdditionalProperties", "doc": "The WidgetData2_kind", "isFixed": false, "isFlags": false, @@ -63,6 +64,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.AdditionalProperties", "doc": "The WidgetData1_kind", "isFixed": false, "isFlags": false, @@ -96,6 +98,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.AdditionalProperties", "doc": "The WidgetData0_kind", "isFixed": false, "isFlags": false, @@ -108,6 +111,7 @@ "$id": "11", "kind": "model", "name": "SpreadRecordForNonDiscriminatedUnion3", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion3", "usage": "Input,Output,Json", "doc": "The model spread Record", @@ -125,6 +129,7 @@ "$id": "14", "kind": "model", "name": "WidgetData2", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.WidgetData2", "usage": "Input,Output,Json", "decorators": [], @@ -192,6 +197,7 @@ "$id": "23", "kind": "model", "name": "WidgetData1", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.WidgetData1", "usage": "Input,Output,Json", "decorators": [], @@ -295,6 +301,7 @@ ] } ], + "clientNamespace": "", "decorators": [] }, "properties": [ @@ -337,6 +344,7 @@ "$id": "42", "kind": "model", "name": "SpreadRecordForNonDiscriminatedUnion2", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion2", "usage": "Input,Output,Json", "doc": "The model spread Record", @@ -353,6 +361,7 @@ "$ref": "23" } ], + "clientNamespace": "", "decorators": [] }, "properties": [ @@ -389,6 +398,7 @@ "$id": "48", "kind": "model", "name": "SpreadRecordForNonDiscriminatedUnion", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordForNonDiscriminatedUnion", "usage": "Input,Output,Json", "doc": "The model spread Record", @@ -402,6 +412,7 @@ "$id": "50", "kind": "model", "name": "WidgetData0", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.WidgetData0", "usage": "Input,Output,Json", "decorators": [], @@ -466,6 +477,7 @@ "$ref": "23" } ], + "clientNamespace": "", "decorators": [] }, "properties": [ @@ -505,6 +517,7 @@ "$id": "63", "kind": "model", "name": "SpreadRecordForDiscriminatedUnion", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordForDiscriminatedUnion", "usage": "Input,Output,Json", "doc": "The model spread Record", @@ -521,6 +534,7 @@ "$ref": "23" } ], + "clientNamespace": "Type.Property.AdditionalProperties", "decorators": [] }, "properties": [ @@ -557,6 +571,7 @@ "$id": "69", "kind": "model", "name": "SpreadRecordForUnion", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadRecordForUnion", "usage": "Input,Output,Json", "doc": "The model spread Record", @@ -581,6 +596,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "properties": [ @@ -617,6 +633,7 @@ "$id": "77", "kind": "model", "name": "MultipleSpreadRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.MultipleSpreadRecord", "usage": "Input,Output,Json", "doc": "The model spread Record and Record", @@ -641,6 +658,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "properties": [ @@ -677,6 +695,7 @@ "$id": "85", "kind": "model", "name": "DifferentSpreadModelArrayDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayDerived", "usage": "Input,Output,Json", "doc": "The model extends from a model that spread Record with the different known property type", @@ -685,6 +704,7 @@ "$id": "86", "kind": "model", "name": "DifferentSpreadModelArrayRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadModelArrayRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the different known property type", @@ -697,6 +717,7 @@ "$id": "88", "kind": "model", "name": "ModelForRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ModelForRecord", "usage": "Input,Output,Json", "doc": "model for record", @@ -806,6 +827,7 @@ "$id": "101", "kind": "model", "name": "DifferentSpreadModelDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadModelDerived", "usage": "Input,Output,Json", "doc": "The model extends from a model that spread Record with the different known property type", @@ -814,6 +836,7 @@ "$id": "102", "kind": "model", "name": "DifferentSpreadModelRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadModelRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the different known property type", @@ -883,6 +906,7 @@ "$id": "110", "kind": "model", "name": "DifferentSpreadFloatDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadFloatDerived", "usage": "Input,Output,Json", "doc": "The model extends from a model that spread Record with the different known property type", @@ -891,6 +915,7 @@ "$id": "111", "kind": "model", "name": "DifferentSpreadFloatRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadFloatRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the different known property type", @@ -969,6 +994,7 @@ "$id": "121", "kind": "model", "name": "DifferentSpreadStringDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadStringDerived", "usage": "Input,Output,Json", "doc": "The model extends from a model that spread Record with the different known property type", @@ -977,6 +1003,7 @@ "$id": "122", "kind": "model", "name": "DifferentSpreadStringRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.DifferentSpreadStringRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the different known property type", @@ -1055,6 +1082,7 @@ "$id": "132", "kind": "model", "name": "SpreadModelArrayRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelArrayRecord", "usage": "Input,Output,Json", "decorators": [], @@ -1104,6 +1132,7 @@ "$id": "138", "kind": "model", "name": "IsModelArrayAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelArrayAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model is from Record type.", @@ -1154,6 +1183,7 @@ "$id": "144", "kind": "model", "name": "ExtendsModelArrayAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelArrayAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model extends from Record type.", @@ -1204,6 +1234,7 @@ "$id": "150", "kind": "model", "name": "SpreadModelRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadModelRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the same known property type", @@ -1240,6 +1271,7 @@ "$id": "154", "kind": "model", "name": "IsModelAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsModelAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model is from Record type.", @@ -1276,6 +1308,7 @@ "$id": "158", "kind": "model", "name": "ExtendsModelAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsModelAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model extends from Record type.", @@ -1312,6 +1345,7 @@ "$id": "162", "kind": "model", "name": "SpreadFloatRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadFloatRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the same known property type", @@ -1357,6 +1391,7 @@ "$id": "168", "kind": "model", "name": "IsFloatAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsFloatAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model is from Record type.", @@ -1402,6 +1437,7 @@ "$id": "174", "kind": "model", "name": "ExtendsFloatAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsFloatAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model extends from Record type.", @@ -1447,6 +1483,7 @@ "$id": "180", "kind": "model", "name": "SpreadStringRecord", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.SpreadStringRecord", "usage": "Input,Output,Json", "doc": "The model spread Record with the same known property type", @@ -1492,6 +1529,7 @@ "$id": "186", "kind": "model", "name": "IsStringAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsStringAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model is from Record type.", @@ -1537,6 +1575,7 @@ "$id": "192", "kind": "model", "name": "ExtendsStringAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsStringAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model extends from Record type.", @@ -1582,6 +1621,7 @@ "$id": "198", "kind": "model", "name": "IsUnknownAdditionalPropertiesDiscriminated", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminated", "usage": "Input,Output,Json", "doc": "The model is Record with a discriminator.", @@ -1658,6 +1698,7 @@ "$id": "209", "kind": "model", "name": "IsUnknownAdditionalPropertiesDiscriminatedDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDiscriminatedDerived", "usage": "Input,Output,Json", "doc": "The derived discriminated type", @@ -1764,6 +1805,7 @@ "$id": "223", "kind": "model", "name": "IsUnknownAdditionalPropertiesDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownAdditionalPropertiesDerived", "usage": "Input,Output,Json", "doc": "The model extends from a type that is Record type", @@ -1772,6 +1814,7 @@ "$id": "224", "kind": "model", "name": "IsUnknownAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.IsUnknownAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model is from Record type.", @@ -1877,6 +1920,7 @@ "$id": "238", "kind": "model", "name": "ExtendsUnknownAdditionalPropertiesDiscriminated", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminated", "usage": "Input,Output,Json", "doc": "The model extends from Record with a discriminator.", @@ -1953,6 +1997,7 @@ "$id": "249", "kind": "model", "name": "ExtendsUnknownAdditionalPropertiesDiscriminatedDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDiscriminatedDerived", "usage": "Input,Output,Json", "doc": "The derived discriminated type", @@ -2059,6 +2104,7 @@ "$id": "263", "kind": "model", "name": "ExtendsUnknownAdditionalPropertiesDerived", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalPropertiesDerived", "usage": "Input,Output,Json", "doc": "The model extends from a type that extends from Record.", @@ -2067,6 +2113,7 @@ "$id": "264", "kind": "model", "name": "ExtendsUnknownAdditionalProperties", + "clientNamespace": "Type.Property.AdditionalProperties", "crossLanguageDefinitionId": "Type.Property.AdditionalProperties.ExtendsUnknownAdditionalProperties", "usage": "Input,Output,Json", "doc": "The model extends from Record type.", @@ -2173,6 +2220,7 @@ { "$id": "278", "Name": "AdditionalPropertiesClient", + "ClientNamespace": "Type.Property.AdditionalProperties", "Doc": "Tests for additional properties of models", "Operations": [], "Protocol": { @@ -2216,6 +2264,7 @@ { "$id": "284", "Name": "ExtendsUnknown", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "285", @@ -2400,6 +2449,7 @@ { "$id": "301", "Name": "ExtendsUnknownDerived", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "302", @@ -2584,6 +2634,7 @@ { "$id": "318", "Name": "ExtendsUnknownDiscriminated", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "319", @@ -2768,6 +2819,7 @@ { "$id": "335", "Name": "IsUnknown", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "336", @@ -2952,6 +3004,7 @@ { "$id": "352", "Name": "IsUnknownDerived", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "353", @@ -3136,6 +3189,7 @@ { "$id": "369", "Name": "IsUnknownDiscriminated", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "370", @@ -3320,6 +3374,7 @@ { "$id": "386", "Name": "ExtendsString", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "387", @@ -3504,6 +3559,7 @@ { "$id": "403", "Name": "IsString", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "404", @@ -3688,6 +3744,7 @@ { "$id": "420", "Name": "SpreadString", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "421", @@ -3872,6 +3929,7 @@ { "$id": "437", "Name": "ExtendsFloat", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "438", @@ -4056,6 +4114,7 @@ { "$id": "454", "Name": "IsFloat", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "455", @@ -4240,6 +4299,7 @@ { "$id": "471", "Name": "SpreadFloat", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "472", @@ -4424,6 +4484,7 @@ { "$id": "488", "Name": "ExtendsModel", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "489", @@ -4608,6 +4669,7 @@ { "$id": "505", "Name": "IsModel", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "506", @@ -4792,6 +4854,7 @@ { "$id": "522", "Name": "SpreadModel", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "523", @@ -4976,6 +5039,7 @@ { "$id": "539", "Name": "ExtendsModelArray", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "540", @@ -5160,6 +5224,7 @@ { "$id": "556", "Name": "IsModelArray", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "557", @@ -5344,6 +5409,7 @@ { "$id": "573", "Name": "SpreadModelArray", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "574", @@ -5528,6 +5594,7 @@ { "$id": "590", "Name": "SpreadDifferentString", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "591", @@ -5712,6 +5779,7 @@ { "$id": "607", "Name": "SpreadDifferentFloat", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "608", @@ -5896,6 +5964,7 @@ { "$id": "624", "Name": "SpreadDifferentModel", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "625", @@ -6080,6 +6149,7 @@ { "$id": "641", "Name": "SpreadDifferentModelArray", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "642", @@ -6264,6 +6334,7 @@ { "$id": "658", "Name": "ExtendsDifferentSpreadString", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "659", @@ -6448,6 +6519,7 @@ { "$id": "675", "Name": "ExtendsDifferentSpreadFloat", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "676", @@ -6632,6 +6704,7 @@ { "$id": "692", "Name": "ExtendsDifferentSpreadModel", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "693", @@ -6816,6 +6889,7 @@ { "$id": "709", "Name": "ExtendsDifferentSpreadModelArray", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "710", @@ -7000,6 +7074,7 @@ { "$id": "726", "Name": "MultipleSpread", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "727", @@ -7184,6 +7259,7 @@ { "$id": "743", "Name": "SpreadRecordUnion", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "744", @@ -7368,6 +7444,7 @@ { "$id": "760", "Name": "SpreadRecordDiscriminatedUnion", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "761", @@ -7552,6 +7629,7 @@ { "$id": "777", "Name": "SpreadRecordNonDiscriminatedUnion", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "778", @@ -7736,6 +7814,7 @@ { "$id": "794", "Name": "SpreadRecordNonDiscriminatedUnion2", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "795", @@ -7920,6 +7999,7 @@ { "$id": "811", "Name": "SpreadRecordNonDiscriminatedUnion3", + "ClientNamespace": "Type.Property.AdditionalProperties", "Operations": [ { "$id": "812", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/Type.Property.Nullable.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/Type.Property.Nullable.sln index 0b5159155d9..578a54ad629 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/Type.Property.Nullable.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Visibility", "src\_Type.Model.Visibility.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.Nullable", "src\Type.Property.Nullable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln deleted file mode 100644 index c6b92390363..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.Nullable", "src\_Type.Property.Nullable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs index e9b1af619d5..eacf8814b15 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs index 9726e1ae065..ad2cd996943 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs index 6768e5300d5..a424dcc6309 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs index c3ee7a8235f..3481b5221d5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs index 97261713bde..2d316f989b4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs index e19fa9a58ac..5436a4fda27 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a507b91f6ed --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Nullable +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..23053980859 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Nullable +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..9e12af03f5e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Nullable +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..546b716b4d9 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Nullable +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs index d23336258fc..47519fb93e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class BytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs index 57c4ff641de..405127755c3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class BytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs index 24db059da67..ae77c83f087 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsByteProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs index 1fe74244ffd..7b90b1cbae9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsByteProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs index 78a34e7b7df..bb4bef9e219 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsModelProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs index 027cfb8b762..27d1e55df6b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsModelProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs index e4b44649c2a..451bb35006a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs index c1de6e9d04e..0ddb435c4d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class CollectionsStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs index c2c4df2db08..2861d73e62e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class DatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs index 0fefe1e406a..70b1384444e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class DatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs index cc57b70713f..e52f19aa955 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class DurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs index 327bd8a124b..b45cf724c03 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class DurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs index eac6d6ef4ac..d304a48be37 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class InnerModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs index 4dd9ed506e0..5a17898c0de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class InnerModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs index 3739ae076a1..db76d0af97a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class StringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs index 65fdda8781f..db16f1102b8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public partial class StringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs index 830b3939533..461ad9d615b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Nullable.Models; namespace _Type.Property.Nullable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs index 039aecf377b..a77548d571b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.Nullable.Models +namespace _Type.Property.Nullable { public static partial class TypePropertyNullableModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/_Type.Model.Visibility.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Type.Property.Nullable.csproj similarity index 74% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/_Type.Model.Visibility.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Type.Property.Nullable.csproj index 23e5c8b47e0..0f9f04a8316 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/_Type.Model.Visibility.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Type.Property.Nullable.csproj @@ -1,9 +1,9 @@ - This is the _Type.Model.Visibility client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Model.Visibility + This is the Type.Property.Nullable client library for developing .NET applications with rich experience. + SDK Code Generation Type.Property.Nullable 1.0.0-beta.1 - _Type.Model.Visibility + Type.Property.Nullable netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj deleted file mode 100644 index d2ead9147f6..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Property.Nullable client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Property.Nullable - 1.0.0-beta.1 - _Type.Property.Nullable - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json index 4f4ce476cf6..d42026ed90d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json @@ -8,6 +8,7 @@ "$id": "2", "kind": "model", "name": "CollectionsStringProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsStringProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Model with collection string properties", @@ -62,7 +63,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -84,6 +86,7 @@ "$id": "13", "kind": "model", "name": "CollectionsModelProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsModelProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Model with collection models properties", @@ -133,6 +136,7 @@ "$id": "21", "kind": "model", "name": "InnerModel", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.InnerModel", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Inner model used in collections model property", @@ -169,7 +173,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -194,6 +199,7 @@ "$id": "28", "kind": "model", "name": "CollectionsByteProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.CollectionsByteProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Model with collection bytes properties", @@ -249,7 +255,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -271,6 +278,7 @@ "$id": "39", "kind": "model", "name": "DurationProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.DurationProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Model with a duration property", @@ -326,7 +334,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.duration", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -348,6 +357,7 @@ "$id": "50", "kind": "model", "name": "DatetimeProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.DatetimeProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Model with a datetime property", @@ -403,7 +413,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.utcDateTime", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -425,6 +436,7 @@ "$id": "61", "kind": "model", "name": "BytesProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.BytesProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Template type for testing models with nullable property. Pass in the type of the property you are looking for", @@ -473,7 +485,8 @@ "encode": "base64", "crossLanguageDefinitionId": "TypeSpec.bytes", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -495,6 +508,7 @@ "$id": "71", "kind": "model", "name": "StringProperty", + "clientNamespace": "Type.Property.Nullable", "crossLanguageDefinitionId": "Type.Property.Nullable.StringProperty", "usage": "Input,Output,JsonMergePatch,Json", "doc": "Template type for testing models with nullable property. Pass in the type of the property you are looking for", @@ -542,7 +556,8 @@ "name": "string", "crossLanguageDefinitionId": "TypeSpec.string", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -565,6 +580,7 @@ { "$id": "81", "Name": "NullableClient", + "ClientNamespace": "Type.Property.Nullable", "Doc": "Illustrates models with nullable properties.", "Operations": [], "Protocol": { @@ -608,6 +624,7 @@ { "$id": "87", "Name": "String", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "88", @@ -930,6 +947,7 @@ { "$id": "115", "Name": "Bytes", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "116", @@ -1252,6 +1270,7 @@ { "$id": "143", "Name": "Datetime", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "144", @@ -1574,6 +1593,7 @@ { "$id": "171", "Name": "Duration", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "172", @@ -1896,6 +1916,7 @@ { "$id": "199", "Name": "CollectionsByte", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "200", @@ -2218,6 +2239,7 @@ { "$id": "227", "Name": "CollectionsModel", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "228", @@ -2540,6 +2562,7 @@ { "$id": "255", "Name": "CollectionsString", + "ClientNamespace": "Type.Property.Nullable", "Operations": [ { "$id": "256", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/_Type._Enum.Extensible.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/Type.Property.Optional.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/_Type._Enum.Extensible.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/Type.Property.Optional.sln index f24c0653d65..006caa9eb75 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/_Type._Enum.Extensible.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/Type.Property.Optional.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type._Enum.Extensible", "src\_Type._Enum.Extensible.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.Optional", "src\Type.Property.Optional.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/_Type.Property.Optional.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/_Type.Property.Optional.sln deleted file mode 100644 index b3130430df0..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/_Type.Property.Optional.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.Optional", "src\_Type.Property.Optional.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/BooleanLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/BooleanLiteral.cs index 0a32a1a4a00..593e92d4244 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/BooleanLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/BooleanLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Bytes.cs index ac2be4cccba..b4d7e3788e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Bytes.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsByte.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsByte.cs index d116273e9a0..706f6515fc5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsByte.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsByte.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsModel.cs index 0f209d46339..dfe28feac96 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/CollectionsModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Datetime.cs index 81574ddc84d..5e578c2da19 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Datetime.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Duration.cs index 18fb39f08e2..03d2758ff8a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Duration.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/FloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/FloatLiteral.cs index 7bd2a98c711..7d71a102cd8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/FloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/FloatLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/IntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/IntLiteral.cs index af77e1f8623..5f5db298391 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/IntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/IntLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..181b2fd3156 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Optional +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..520f9c462dd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Optional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..edd731d3869 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Optional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..af35776a325 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.Optional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs index 599f0591b77..bcd8ec31f08 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class BooleanLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.cs index 34014e2a138..230e7f625a1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BooleanLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class BooleanLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs index 7cd9bb6803e..6dfdd868d21 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class BytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.cs index 92579235e17..6ad8f937b4a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/BytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class BytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs index 009bc213f1e..2219cf836bd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class CollectionsByteProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.cs index c8a0ceb2efd..4ef4526981f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsByteProperty.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class CollectionsByteProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs index 10d5fb0a559..00b37679c73 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class CollectionsModelProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.cs index cbd52c6be04..858434f1a76 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/CollectionsModelProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class CollectionsModelProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs index 2c6955ddd7c..1fa31738297 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class DatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.cs index f6291ef6dc7..360d305fb2c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class DatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs index bc52b8167bd..af3d3d06fde 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class DurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.cs index f9af48bfc23..20e7bc8dc56 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/DurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class DurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs index 74daa15e44d..33387e66beb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class FloatLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.cs index a50deb15995..38315674c4f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class FloatLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs index 835345a289e..564dcb11f1a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public readonly partial struct FloatLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.cs index f20c9110f5e..fa02715979b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/FloatLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public readonly partial struct FloatLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs index 5b68e8a4983..2fd347b7cb3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class IntLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.cs index 483e6fd7cd7..6ffc421ae8b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class IntLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs index 143706669ef..133eec6e823 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public readonly partial struct IntLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.cs index 2c21203426f..fdb42d78937 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/IntLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public readonly partial struct IntLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs index d9344cbc656..cc7f6a5cddc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class PlainDateProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.cs index 0462900f9c1..0dff133d72c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainDateProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class PlainDateProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs index 76d6cd72f0a..87390794833 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class PlainTimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.cs index 4c2db6e1ce3..541f1ceb642 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/PlainTimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class PlainTimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs index 60821360ae3..e1f24acdb8b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class RequiredAndOptionalProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.cs index d73dbf65568..a01a956273e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/RequiredAndOptionalProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class RequiredAndOptionalProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs index 763365bcca4..510e4a37e28 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class StringLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.cs index bd93aaf3a3c..11f9dfd3e85 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class StringLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralPropertyProperty.cs index 7d80fc98d74..634b78ca710 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public readonly partial struct StringLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs index 666a9e7567c..ef570da8929 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class StringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.cs index 9fccd2a11a7..715cfab61b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/StringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class StringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs index 4c817a3147a..c5916501982 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionFloatLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.cs index b7030daea45..cfd5a797750 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionFloatLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs index 1cc8f551254..a833b1ec6b7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public enum UnionFloatLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs index 6da8fcea6ff..c19e8f23b6c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionIntLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.cs index 1db80176587..278787ca6eb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionIntLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralPropertyProperty.cs index 3f52e7f446d..c232fe7ad2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionIntLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public enum UnionIntLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs index fc4394b18fc..92528bcb933 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionStringLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.cs index 5d2ef83713a..76701175d73 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public partial class UnionStringLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralPropertyProperty.cs index 1b91f2b3ecb..b29074f1b3b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/Models/UnionStringLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public enum UnionStringLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainDate.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainDate.cs index 0d841833f74..27c9d8c861b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainDate.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainDate.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainTime.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainTime.cs index e94179657fe..733f618e280 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainTime.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/PlainTime.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/RequiredAndOptional.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/RequiredAndOptional.cs index d074d37cbef..94bf40cd0f3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/RequiredAndOptional.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/RequiredAndOptional.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/String.cs index 6a1259a9127..223187bfb1e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/String.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/StringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/StringLiteral.cs index ed6c1f30dc3..d6fca1040c1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/StringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/StringLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/TypePropertyOptionalModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/TypePropertyOptionalModelFactory.cs index 10e4591796d..d7993038cfe 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/TypePropertyOptionalModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/TypePropertyOptionalModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.Optional.Models +namespace _Type.Property.Optional { public static partial class TypePropertyOptionalModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs index c64ca77294c..aa088f014e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionFloatLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionIntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionIntLiteral.cs index e14701470bd..65a65dc54ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionIntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionIntLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionStringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionStringLiteral.cs index f504297e665..1041ae1cf99 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionStringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Generated/UnionStringLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.Optional.Models; namespace _Type.Property.Optional { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/_Type._Enum.Extensible.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Type.Property.Optional.csproj similarity index 74% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/_Type._Enum.Extensible.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Type.Property.Optional.csproj index 644789befdd..a700751d52d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/extensible/src/_Type._Enum.Extensible.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/Type.Property.Optional.csproj @@ -1,9 +1,9 @@ - This is the _Type._Enum.Extensible client library for developing .NET applications with rich experience. - SDK Code Generation _Type._Enum.Extensible + This is the Type.Property.Optional client library for developing .NET applications with rich experience. + SDK Code Generation Type.Property.Optional 1.0.0-beta.1 - _Type._Enum.Extensible + Type.Property.Optional netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/_Type.Property.Optional.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/_Type.Property.Optional.csproj deleted file mode 100644 index aac7d8b08c8..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/src/_Type.Property.Optional.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Property.Optional client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Property.Optional - 1.0.0-beta.1 - _Type.Property.Optional - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/tspCodeModel.json index 0c7c3c9f2f0..fb20fc9f8ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/optionality/tspCodeModel.json @@ -51,6 +51,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -104,6 +105,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -157,6 +159,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -189,6 +192,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.Optional", "doc": "The FloatLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -222,6 +226,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.Optional", "doc": "The IntLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -255,6 +260,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.Optional", "doc": "The StringLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -267,6 +273,7 @@ "$id": "29", "kind": "model", "name": "RequiredAndOptionalProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.RequiredAndOptionalProperty", "usage": "Input,Output,Json", "doc": "Model with required and optional properties", @@ -332,6 +339,7 @@ "$id": "38", "kind": "model", "name": "UnionFloatLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.UnionFloatLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with union of float literal property", @@ -366,6 +374,7 @@ "$id": "42", "kind": "model", "name": "UnionIntLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.UnionIntLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with union of int literal property", @@ -400,6 +409,7 @@ "$id": "46", "kind": "model", "name": "UnionStringLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.UnionStringLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with union of string literal property", @@ -434,6 +444,7 @@ "$id": "50", "kind": "model", "name": "BooleanLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.BooleanLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with boolean literal property", @@ -478,6 +489,7 @@ "$id": "56", "kind": "model", "name": "FloatLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.FloatLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with float literal property", @@ -518,6 +530,7 @@ "$id": "61", "kind": "model", "name": "IntLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.IntLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with int literal property", @@ -558,6 +571,7 @@ "$id": "66", "kind": "model", "name": "StringLiteralProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.StringLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with string literal property", @@ -598,6 +612,7 @@ "$id": "71", "kind": "model", "name": "CollectionsModelProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsModelProperty", "usage": "Input,Output,Json", "doc": "Model with collection models properties", @@ -617,6 +632,7 @@ "$id": "74", "kind": "model", "name": "StringProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.StringProperty", "usage": "Input,Output,Json", "doc": "Template type for testing models with optional property. Pass in the type of the property you are looking for", @@ -677,6 +693,7 @@ "$id": "81", "kind": "model", "name": "CollectionsByteProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.CollectionsByteProperty", "usage": "Input,Output,Json", "doc": "Model with collection bytes properties", @@ -723,6 +740,7 @@ "$id": "87", "kind": "model", "name": "PlainTimeProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.PlainTimeProperty", "usage": "Input,Output,Json", "doc": "Model with a plainTime property", @@ -761,6 +779,7 @@ "$id": "92", "kind": "model", "name": "PlainDateProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.PlainDateProperty", "usage": "Input,Output,Json", "doc": "Model with a plainDate property", @@ -799,6 +818,7 @@ "$id": "97", "kind": "model", "name": "DurationProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.DurationProperty", "usage": "Input,Output,Json", "doc": "Model with a duration property", @@ -845,6 +865,7 @@ "$id": "103", "kind": "model", "name": "DatetimeProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.DatetimeProperty", "usage": "Input,Output,Json", "doc": "Model with a datetime property", @@ -891,6 +912,7 @@ "$id": "109", "kind": "model", "name": "BytesProperty", + "clientNamespace": "Type.Property.Optional", "crossLanguageDefinitionId": "Type.Property.Optional.BytesProperty", "usage": "Input,Output,Json", "doc": "Template type for testing models with optional property. Pass in the type of the property you are looking for", @@ -931,6 +953,7 @@ { "$id": "114", "Name": "OptionalClient", + "ClientNamespace": "Type.Property.Optional", "Doc": "Illustrates models with optional properties.", "Operations": [], "Protocol": { @@ -974,6 +997,7 @@ { "$id": "120", "Name": "String", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "121", @@ -1296,6 +1320,7 @@ { "$id": "148", "Name": "Bytes", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "149", @@ -1618,6 +1643,7 @@ { "$id": "176", "Name": "Datetime", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "177", @@ -1940,6 +1966,7 @@ { "$id": "204", "Name": "Duration", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "205", @@ -2262,6 +2289,7 @@ { "$id": "232", "Name": "PlainDate", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "233", @@ -2584,6 +2612,7 @@ { "$id": "260", "Name": "PlainTime", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "261", @@ -2906,6 +2935,7 @@ { "$id": "288", "Name": "CollectionsByte", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "289", @@ -3228,6 +3258,7 @@ { "$id": "316", "Name": "CollectionsModel", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "317", @@ -3550,6 +3581,7 @@ { "$id": "344", "Name": "StringLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "345", @@ -3872,6 +3904,7 @@ { "$id": "372", "Name": "IntLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "373", @@ -4194,6 +4227,7 @@ { "$id": "400", "Name": "FloatLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "401", @@ -4516,6 +4550,7 @@ { "$id": "428", "Name": "BooleanLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "429", @@ -4838,6 +4873,7 @@ { "$id": "456", "Name": "UnionStringLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "457", @@ -5160,6 +5196,7 @@ { "$id": "484", "Name": "UnionIntLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "485", @@ -5482,6 +5519,7 @@ { "$id": "512", "Name": "UnionFloatLiteral", + "ClientNamespace": "Type.Property.Optional", "Operations": [ { "$id": "513", @@ -5804,6 +5842,7 @@ { "$id": "540", "Name": "RequiredAndOptional", + "ClientNamespace": "Type.Property.Optional", "Doc": "Test optional and required properties", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/Type.Property.ValueTypes.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/Type.Property.ValueTypes.sln new file mode 100644 index 00000000000..8aaefb554e8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/Type.Property.ValueTypes.sln @@ -0,0 +1,48 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Property.ValueTypes", "src\Type.Property.ValueTypes.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} + EndGlobalSection +EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/_Type.Property.ValueTypes.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/_Type.Property.ValueTypes.sln deleted file mode 100644 index 8048bd2d000..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/_Type.Property.ValueTypes.sln +++ /dev/null @@ -1,48 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.ValueTypes", "src\_Type.Property.ValueTypes.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE} - EndGlobalSection -EndGlobal diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Boolean.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Boolean.cs index 9d54b641700..3f6b9d2df7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Boolean.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Boolean.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/BooleanLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/BooleanLiteral.cs index f9d533fadfe..679f7a738e3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/BooleanLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/BooleanLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Bytes.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Bytes.cs index 43372c0edc9..b0a807a9c6d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Bytes.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Bytes.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsInt.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsInt.cs index 5a16eb7ef17..3e6cc227cf5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsInt.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsModel.cs index 6331be576b2..2a9ffb958a8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsModel.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsString.cs index bf25a2d2662..c1dd5d23c45 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/CollectionsString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Datetime.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Datetime.cs index b5356f674b1..b8f6983712b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Datetime.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Datetime.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal.cs index 06d5a0296a2..cfc5fa3fc48 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal128.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal128.cs index 3008dfa3862..553501b9bdd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal128.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Decimal128.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/DictionaryString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/DictionaryString.cs index 1f4db6785b1..0da288b589b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/DictionaryString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/DictionaryString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Duration.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Duration.cs index 7d7ba87f76f..fb81d1ff2de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Duration.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Duration.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Enum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Enum.cs index bf728537008..082585a6b1b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Enum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Enum.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/ExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/ExtensibleEnum.cs index 170fab54799..1d39d6232b2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/ExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/ExtensibleEnum.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Float.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Float.cs index fb995cec26c..89917bd0d67 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Float.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Float.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/FloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/FloatLiteral.cs index 520d2c84fc8..89f86508d9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/FloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/FloatLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Int.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Int.cs index 1ae6c8c891c..e4e359014ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Int.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Int.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/IntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/IntLiteral.cs index 41d5e985e1b..75851545805 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/IntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/IntLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..8027c9ef5c5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.ValueTypes +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..6d9baf3162d --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.ValueTypes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..04814ed1dc0 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.ValueTypes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..aee7cfd9c50 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Property.ValueTypes +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Model.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Model.cs index 0a251ffc7d7..83467e85608 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Model.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Model.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs index 0a9ce65214b..4f3a5e7c639 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BooleanLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.cs index 84b8a02ef18..6cfeb42305d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BooleanLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs index 223524a5232..aab8ab0e308 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BooleanProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.cs index 6c3cf04e43e..978153542b7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BooleanProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BooleanProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs index 24cb80b5102..a94f850ac0c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BytesProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.cs index 60dbd550582..e1d5865742f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/BytesProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class BytesProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs index 342d59082f3..37128ddf591 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsIntProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.cs index 5e963daadea..97556f104ce 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsIntProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsIntProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs index abb47647910..4b9040eb9b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsModelProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.cs index 89322cd2772..d83f2e06095 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsModelProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsModelProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs index 1ecdc9973bd..fedce3dcd80 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.cs index 2f156d59a74..271f0d948ea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/CollectionsStringProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class CollectionsStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs index 2afbadcab5a..e80174738ca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DatetimeProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.cs index b031d9653ed..fbd50216c39 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DatetimeProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DatetimeProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs index d021e14846e..da351b4b66b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class Decimal128Property : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.cs index 93c3cbcf151..76c00806cd3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/Decimal128Property.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class Decimal128Property { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs index 24c28f6bb61..2dc0876fd66 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DecimalProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.cs index a9ade251f58..d05f70daf55 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DecimalProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DecimalProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs index 9c0648593e8..4bbf1454c92 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DictionaryStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.cs index f13b8762454..5c39738249c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DictionaryStringProperty.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DictionaryStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs index 03963698c92..4023ebfac98 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DurationProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.cs index 9ea67f728d4..0fed07aa40b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/DurationProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class DurationProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs index bef3ff56e18..c8efce5aee0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class EnumProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.cs index fff65a44e24..444ab4f440a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/EnumProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class EnumProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtendedEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtendedEnum.cs index 9ff233a22f6..b31956543f1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtendedEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtendedEnum.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct ExtendedEnum : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs index 66fca143402..c715edd7309 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class ExtensibleEnumProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.cs index f35a4bdc860..fb25d9d4a95 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ExtensibleEnumProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class ExtensibleEnumProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FixedInnerEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FixedInnerEnum.cs index dbd9a020ae2..13e7b17e5a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FixedInnerEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FixedInnerEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public enum FixedInnerEnum { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs index 3021c71b3e7..e0b386903a8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class FloatLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.cs index 875ecd3a1d4..2a5de64d2ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class FloatLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs index 4c1e001a995..84722ca93fd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct FloatLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.cs index 993d46117c6..7ca4f46f6c4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct FloatLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs index 20245d714fb..c7ade1acd6d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class FloatProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.cs index aea5ba2abd7..9a2a740c365 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/FloatProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class FloatProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerEnum.cs index 7e58ea29a83..5c76cc2061f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerEnum.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct InnerEnum : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs index 8582f589729..5bc153e6237 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class InnerModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.cs index 39c0a0205d1..485bf3479e4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/InnerModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class InnerModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs index 29aa44bf68c..d43ff85edbb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class IntLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.cs index f3c7af563f4..f6a828dd33a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class IntLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs index aa787897120..da3a04969bf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct IntLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.cs index 75355854ee1..3e89318b4e9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct IntLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs index a9278afa7e9..96def8cac60 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class IntProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.cs index 1e91c5bca8f..610955c12ad 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/IntProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class IntProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs index fbd1c86de2b..a7fbd4b466d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class ModelProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.cs index d24f6b0a23c..162bdbda143 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/ModelProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class ModelProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs index e71019ddbd3..652ae9a8eec 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class NeverProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.cs index 1af24c3828d..d8b147c98a9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/NeverProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class NeverProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs index a2ec3cd690c..cf7e5b50bc7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class StringLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.cs index ba3f0ac7bc1..e7ca7b7d30e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class StringLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralPropertyProperty.cs index 31cbe06daee..11a5af931c0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringLiteralPropertyProperty.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public readonly partial struct StringLiteralPropertyProperty : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs index 3f566a3bba6..dffb6f90e2c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class StringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.cs index c779fed81ff..3335bab9b55 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/StringProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class StringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs index 33b63132239..74328d17d32 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionEnumValueProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.cs index 6d13fe72e65..6889033a32d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionEnumValueProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionEnumValueProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs index b96802caf3e..fa2743226cd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionFloatLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.cs index 4729f56dd5a..40fc77eb8e2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionFloatLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs index 6a9574bd532..c24279dbe6b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionFloatLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public enum UnionFloatLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs index e8c57529070..047d8150b90 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionIntLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.cs index 002a6b9b9cd..05f800b90c1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionIntLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralPropertyProperty.cs index 5768ff54293..200b4e4f35d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionIntLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public enum UnionIntLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs index e31a97e6397..02946b4be43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionStringLiteralProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.cs index 16d43161229..2172331185b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnionStringLiteralProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralPropertyProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralPropertyProperty.cs index cc334d9f4f9..024dc5c9a9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralPropertyProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnionStringLiteralPropertyProperty.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public enum UnionStringLiteralPropertyProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs index eb236daa84f..f3bd330e6fb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownArrayProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.cs index 807059d602d..7c354b1d450 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownArrayProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownArrayProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs index 343863f8517..9383e87965f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownDictProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.cs index ab3fbcaffef..f16b3f946ff 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownDictProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownDictProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs index 3a69473c7f3..a087fc76f9a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownIntProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.cs index 503d0812330..61f00caee2e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownIntProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownIntProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs index e130c6b8c36..9e2acdbb09f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownStringProperty : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.cs index ae6c921c10c..c1ce5446f4a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Models/UnknownStringProperty.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public partial class UnknownStringProperty { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Never.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Never.cs index 1a7fe82aa64..92ff671d14a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Never.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/Never.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/String.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/String.cs index 35fe0e825e2..750373bbcfc 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/String.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/String.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/StringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/StringLiteral.cs index a1c71cae2bb..d02b76d3dd6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/StringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/StringLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/TypePropertyValueTypesModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/TypePropertyValueTypesModelFactory.cs index f85605a8d98..c5da6d1dc9b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/TypePropertyValueTypesModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/TypePropertyValueTypesModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Property.ValueTypes.Models +namespace _Type.Property.ValueTypes { public static partial class TypePropertyValueTypesModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionEnumValue.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionEnumValue.cs index 6eb221cb0f6..69962b5cd3f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionEnumValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionEnumValue.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs index 9854397c856..620ccef7d9d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionFloatLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionIntLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionIntLiteral.cs index 349f95c5f88..64b2d1651f8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionIntLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionIntLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionStringLiteral.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionStringLiteral.cs index 201ab5ae08d..8dbaa7dec43 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionStringLiteral.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnionStringLiteral.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownArray.cs index abb00dd8970..b8e85f2c700 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownDict.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownDict.cs index e123fdd9064..6c050d94eff 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownDict.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownDict.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownInt.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownInt.cs index 352dc6a68a0..222c28277e7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownInt.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownString.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownString.cs index dbcf8b93cea..2af9c5e7276 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownString.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Generated/UnknownString.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Property.ValueTypes.Models; namespace _Type.Property.ValueTypes { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Type.Property.ValueTypes.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Type.Property.ValueTypes.csproj new file mode 100644 index 00000000000..7119fa3b597 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/Type.Property.ValueTypes.csproj @@ -0,0 +1,16 @@ + + + This is the Type.Property.ValueTypes client library for developing .NET applications with rich experience. + SDK Code Generation Type.Property.ValueTypes + 1.0.0-beta.1 + Type.Property.ValueTypes + netstandard2.0 + latest + true + + + + + + + diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/_Type.Property.ValueTypes.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/_Type.Property.ValueTypes.csproj deleted file mode 100644 index 148de25ec4e..00000000000 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/src/_Type.Property.ValueTypes.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - This is the _Type.Property.ValueTypes client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Property.ValueTypes - 1.0.0-beta.1 - _Type.Property.ValueTypes - netstandard2.0 - latest - true - - - - - - - diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/tspCodeModel.json index d91eedc9ce8..acd033d193d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/value-types/tspCodeModel.json @@ -34,6 +34,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Property.ValueTypes", "isFixed": false, "isFlags": false, "usage": "Input,Output,Json", @@ -87,6 +88,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -140,6 +142,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -193,6 +196,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -225,6 +229,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.ValueTypes", "doc": "The FloatLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -258,6 +263,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.ValueTypes", "doc": "The IntLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -291,6 +297,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "Type.Property.ValueTypes", "doc": "The StringLiteralProperty_property", "isFixed": false, "isFlags": false, @@ -347,6 +354,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Property.ValueTypes", "doc": "Enum that will be used as a property for model EnumProperty. Extensible.", "isFixed": false, "isFlags": false, @@ -403,6 +411,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Property.ValueTypes", "doc": "Enum that will be used as a property for model EnumProperty. Non-extensible.", "isFixed": true, "isFlags": false, @@ -415,6 +424,7 @@ "$id": "45", "kind": "model", "name": "UnionEnumValueProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionEnumValueProperty", "usage": "Input,Output,Json", "doc": "Template type for testing models with specific properties. Pass in the type of the property you are looking for", @@ -455,6 +465,7 @@ "$id": "50", "kind": "model", "name": "UnionFloatLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionFloatLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a union of float literal as property.", @@ -489,6 +500,7 @@ "$id": "54", "kind": "model", "name": "UnionIntLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionIntLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a union of int literal as property.", @@ -523,6 +535,7 @@ "$id": "58", "kind": "model", "name": "UnionStringLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnionStringLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a union of string literal as property.", @@ -557,6 +570,7 @@ "$id": "62", "kind": "model", "name": "BooleanLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a boolean literal property.", @@ -601,6 +615,7 @@ "$id": "68", "kind": "model", "name": "FloatLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a float literal property.", @@ -641,6 +656,7 @@ "$id": "73", "kind": "model", "name": "IntLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a int literal property.", @@ -681,6 +697,7 @@ "$id": "78", "kind": "model", "name": "StringLiteralProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringLiteralProperty", "usage": "Input,Output,Json", "doc": "Model with a string literal property.", @@ -721,6 +738,7 @@ "$id": "83", "kind": "model", "name": "UnknownArrayProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownArrayProperty", "usage": "Input,Output,Json", "doc": "Model with a property unknown, and the data is an array.", @@ -759,6 +777,7 @@ "$id": "88", "kind": "model", "name": "UnknownDictProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownDictProperty", "usage": "Input,Output,Json", "doc": "Model with a property unknown, and the data is a dictionnary.", @@ -797,6 +816,7 @@ "$id": "93", "kind": "model", "name": "UnknownIntProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownIntProperty", "usage": "Input,Output,Json", "doc": "Model with a property unknown, and the data is a int32.", @@ -835,6 +855,7 @@ "$id": "98", "kind": "model", "name": "UnknownStringProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.UnknownStringProperty", "usage": "Input,Output,Json", "doc": "Model with a property unknown, and the data is a string.", @@ -873,6 +894,7 @@ "$id": "103", "kind": "model", "name": "NeverProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.NeverProperty", "usage": "Input,Output,Json", "doc": "Model with a property never. (This property should not be included).", @@ -883,6 +905,7 @@ "$id": "104", "kind": "model", "name": "DictionaryStringProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.DictionaryStringProperty", "usage": "Input,Output,Json", "doc": "Model with dictionary string properties", @@ -933,6 +956,7 @@ "$id": "111", "kind": "model", "name": "CollectionsModelProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsModelProperty", "usage": "Input,Output,Json", "doc": "Model with collection model properties", @@ -952,6 +976,7 @@ "$id": "114", "kind": "model", "name": "InnerModel", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.InnerModel", "usage": "Input,Output,Json", "doc": "Inner model. Will be a property type for ModelWithModelProperties", @@ -1012,6 +1037,7 @@ "$id": "121", "kind": "model", "name": "CollectionsIntProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsIntProperty", "usage": "Input,Output,Json", "doc": "Model with collection int properties", @@ -1057,6 +1083,7 @@ "$id": "127", "kind": "model", "name": "CollectionsStringProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.CollectionsStringProperty", "usage": "Input,Output,Json", "doc": "Model with collection string properties", @@ -1102,6 +1129,7 @@ "$id": "133", "kind": "model", "name": "ModelProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.ModelProperty", "usage": "Input,Output,Json", "doc": "Model with model properties", @@ -1136,6 +1164,7 @@ "$id": "137", "kind": "model", "name": "ExtensibleEnumProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.ExtensibleEnumProperty", "usage": "Input,Output,Json", "doc": "Model with extensible enum properties", @@ -1170,6 +1199,7 @@ "$id": "141", "kind": "model", "name": "EnumProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.EnumProperty", "usage": "Input,Output,Json", "doc": "Model with enum properties", @@ -1204,6 +1234,7 @@ "$id": "145", "kind": "model", "name": "DurationProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.DurationProperty", "usage": "Input,Output,Json", "doc": "Model with a duration property", @@ -1250,6 +1281,7 @@ "$id": "151", "kind": "model", "name": "DatetimeProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.DatetimeProperty", "usage": "Input,Output,Json", "doc": "Model with a datetime property", @@ -1296,6 +1328,7 @@ "$id": "157", "kind": "model", "name": "Decimal128Property", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.Decimal128Property", "usage": "Input,Output,Json", "doc": "Model with a decimal128 property", @@ -1334,6 +1367,7 @@ "$id": "162", "kind": "model", "name": "DecimalProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.DecimalProperty", "usage": "Input,Output,Json", "doc": "Model with a decimal property", @@ -1372,6 +1406,7 @@ "$id": "167", "kind": "model", "name": "FloatProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.FloatProperty", "usage": "Input,Output,Json", "doc": "Model with a float property", @@ -1410,6 +1445,7 @@ "$id": "172", "kind": "model", "name": "IntProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.IntProperty", "usage": "Input,Output,Json", "doc": "Model with a int property", @@ -1448,6 +1484,7 @@ "$id": "177", "kind": "model", "name": "BytesProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.BytesProperty", "usage": "Input,Output,Json", "doc": "Model with a bytes property", @@ -1487,6 +1524,7 @@ "$id": "182", "kind": "model", "name": "StringProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.StringProperty", "usage": "Input,Output,Json", "doc": "Model with a string property", @@ -1525,6 +1563,7 @@ "$id": "187", "kind": "model", "name": "BooleanProperty", + "clientNamespace": "Type.Property.ValueTypes", "crossLanguageDefinitionId": "Type.Property.ValueTypes.BooleanProperty", "usage": "Input,Output,Json", "doc": "Model with a boolean property", @@ -1564,6 +1603,7 @@ { "$id": "192", "Name": "ValueTypesClient", + "ClientNamespace": "Type.Property.ValueTypes", "Doc": "Illustrates various property types for models", "Operations": [], "Protocol": { @@ -1607,6 +1647,7 @@ { "$id": "198", "Name": "Boolean", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "199", @@ -1791,6 +1832,7 @@ { "$id": "215", "Name": "String", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "216", @@ -1975,6 +2017,7 @@ { "$id": "232", "Name": "Bytes", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "233", @@ -2159,6 +2202,7 @@ { "$id": "249", "Name": "Int", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "250", @@ -2343,6 +2387,7 @@ { "$id": "266", "Name": "Float", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "267", @@ -2527,6 +2572,7 @@ { "$id": "283", "Name": "Decimal", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "284", @@ -2711,6 +2757,7 @@ { "$id": "300", "Name": "Decimal128", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "301", @@ -2895,6 +2942,7 @@ { "$id": "317", "Name": "Datetime", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "318", @@ -3079,6 +3127,7 @@ { "$id": "334", "Name": "Duration", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "335", @@ -3263,6 +3312,7 @@ { "$id": "351", "Name": "Enum", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "352", @@ -3447,6 +3497,7 @@ { "$id": "368", "Name": "ExtensibleEnum", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "369", @@ -3631,6 +3682,7 @@ { "$id": "385", "Name": "Model", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "386", @@ -3815,6 +3867,7 @@ { "$id": "402", "Name": "CollectionsString", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "403", @@ -3999,6 +4052,7 @@ { "$id": "419", "Name": "CollectionsInt", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "420", @@ -4183,6 +4237,7 @@ { "$id": "436", "Name": "CollectionsModel", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "437", @@ -4367,6 +4422,7 @@ { "$id": "453", "Name": "DictionaryString", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "454", @@ -4551,6 +4607,7 @@ { "$id": "470", "Name": "Never", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "471", @@ -4735,6 +4792,7 @@ { "$id": "487", "Name": "UnknownString", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "488", @@ -4919,6 +4977,7 @@ { "$id": "504", "Name": "UnknownInt", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "505", @@ -5103,6 +5162,7 @@ { "$id": "521", "Name": "UnknownDict", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "522", @@ -5287,6 +5347,7 @@ { "$id": "538", "Name": "UnknownArray", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "539", @@ -5471,6 +5532,7 @@ { "$id": "555", "Name": "StringLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "556", @@ -5655,6 +5717,7 @@ { "$id": "572", "Name": "IntLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "573", @@ -5839,6 +5902,7 @@ { "$id": "589", "Name": "FloatLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "590", @@ -6023,6 +6087,7 @@ { "$id": "606", "Name": "BooleanLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "607", @@ -6207,6 +6272,7 @@ { "$id": "623", "Name": "UnionStringLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "624", @@ -6391,6 +6457,7 @@ { "$id": "640", "Name": "UnionIntLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "641", @@ -6575,6 +6642,7 @@ { "$id": "657", "Name": "UnionFloatLiteral", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "658", @@ -6759,6 +6827,7 @@ { "$id": "674", "Name": "UnionEnumValue", + "ClientNamespace": "Type.Property.ValueTypes", "Operations": [ { "$id": "675", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/_Type.Union.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/Type.Scalar.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/_Type.Union.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/Type.Scalar.sln index 36e04c8499a..467654e0d11 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/_Type.Union.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/Type.Scalar.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Union", "src\_Type.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Scalar", "src\Type.Scalar.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..9fa48773535 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Scalar +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..5d67210a159 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Scalar +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..6e169cee9a2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Scalar +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..c7494c1c0e3 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Scalar +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/_Type.Union.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Type.Scalar.csproj similarity index 75% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/_Type.Union.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Type.Scalar.csproj index 3612696d0cf..a034354f160 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/_Type.Union.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/Type.Scalar.csproj @@ -1,9 +1,9 @@ - This is the _Type.Union client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Union + This is the Type.Scalar client library for developing .NET applications with rich experience. + SDK Code Generation Type.Scalar 1.0.0-beta.1 - _Type.Union + Type.Scalar netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/tspCodeModel.json index 9672651fbc6..632b6263864 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/tspCodeModel.json @@ -8,6 +8,7 @@ { "$id": "2", "Name": "ScalarClient", + "ClientNamespace": "Type.Scalar", "Operations": [], "Protocol": { "$id": "3" @@ -50,6 +51,7 @@ { "$id": "8", "Name": "String", + "ClientNamespace": "Type.Scalar", "Operations": [ { "$id": "9", @@ -242,6 +244,7 @@ { "$id": "27", "Name": "Boolean", + "ClientNamespace": "Type.Scalar", "Operations": [ { "$id": "28", @@ -434,6 +437,7 @@ { "$id": "46", "Name": "Unknown", + "ClientNamespace": "Type.Scalar", "Operations": [ { "$id": "47", @@ -626,6 +630,7 @@ { "$id": "65", "Name": "DecimalType", + "ClientNamespace": "Type.Scalar", "Doc": "Decimal type", "Operations": [ { @@ -865,6 +870,7 @@ { "$id": "88", "Name": "Decimal128Type", + "ClientNamespace": "Type.Scalar", "Doc": "Decimal128 type", "Operations": [ { @@ -1104,6 +1110,7 @@ { "$id": "111", "Name": "DecimalVerify", + "ClientNamespace": "Type.Scalar", "Doc": "Decimal type verification", "Operations": [ { @@ -1301,6 +1308,7 @@ { "$id": "131", "Name": "Decimal128Verify", + "ClientNamespace": "Type.Scalar", "Doc": "Decimal128 type verification", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/_Type.Scalar.sln b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/Type.Union.sln similarity index 95% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/_Type.Scalar.sln rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/Type.Union.sln index 549c8934a79..8c390b1dc58 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/_Type.Scalar.sln +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/Type.Union.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Scalar", "src\_Type.Scalar.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Type.Union", "src\Type.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/EnumsOnly.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/EnumsOnly.cs index 00b1e30fd33..5f4de18f4ca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/EnumsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/EnumsOnly.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/FloatsOnly.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/FloatsOnly.cs index 86d06f8752a..94eed0e80a7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/FloatsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/FloatsOnly.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..c12d19b96da --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace _Type.Union +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..2918137bcc2 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace _Type.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..02b19ce5055 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace _Type.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..fb535b3b718 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace _Type.Union +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/IntsOnly.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/IntsOnly.cs index 3af98894e98..eb5453d13bb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/IntsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/IntsOnly.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedLiterals.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedLiterals.cs index 57c0a3189bb..6e4f9c20207 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedLiterals.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedLiterals.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedTypes.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedTypes.cs index 5769b9d1322..f651a612126 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedTypes.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/MixedTypes.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.Serialization.cs index 9ed29707c6c..512871fd3ba 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class Cat : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.cs index 0044815dc3c..fe5cca7c7c0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Cat.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class Cat { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.Serialization.cs index aafb341992e..04c1bc56412 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class Dog : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.cs index 8a4c372da8e..1754f6b7635 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/Dog.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class Dog { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs index 2730a72a9fb..6fb764f7518 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class EnumsOnlyCases : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.cs index 35d4e2540d2..f70f5f7d7b4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCases.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class EnumsOnlyCases { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesLr.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesLr.cs index 92eb890e4bb..27cb65862f7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesLr.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesLr.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public enum EnumsOnlyCasesLr { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesUd.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesUd.cs index 4bcf879773a..e58e353aae8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesUd.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/EnumsOnlyCasesUd.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public enum EnumsOnlyCasesUd { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.Serialization.cs index 7ead93cced5..3da55276b94 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.cs index 31dfd77cc5f..ad0c93a809a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs index c18d3d2adf5..923d95647fd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.cs index 3578d09560b..ba4dffd8b49 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs index 506c68b55b0..e63fbaf2650 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.cs index e109c530778..841494b9be8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs index eadd14f7a62..c2efb1c66b5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse3 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.cs index dda8713c2b0..34ef0e362e1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs index ddd77be293d..1ef7b8c7e1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse4 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.cs index 5771661cc52..d44aa16f7a9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse4.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse4 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs index 2cf45c5f0eb..8032c6b2eb5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse5 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.cs index fa8dd3674cb..5da67ac5aa3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse5.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse5 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs index 5276b5cc253..22b570cdc01 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse6 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.cs index e86431a7fbc..acf1262b303 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse6.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse6 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs index bf3f12cd9fc..1ebe2504eea 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse7 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.cs index 18e8efdb93f..117d4ba7bdd 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse7.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse7 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs index 50e086f269f..94fdc161cd1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse8 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.cs index ab615daa653..27e34b485ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse8.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse8 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs index 063c4305dca..b7b1f03dd7c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse9 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.cs index ea4943c5ade..b1b535aea26 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponse9.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public partial class GetResponse9 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp1.cs index bfa5bd73e7f..9162cb84551 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public enum GetResponseProp1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp2.cs index 6314826c2d3..f0738ab58e4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public enum GetResponseProp2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp3.cs index da6ee88df06..88433fcc7ec 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp3.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Union.Models +namespace _Type.Union { public readonly partial struct GetResponseProp3 : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp4.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp4.cs index 38e7cf70657..beb3dbfa4b5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp4.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/GetResponseProp4.cs @@ -2,7 +2,7 @@ #nullable disable -namespace _Type.Union.Models +namespace _Type.Union { public enum GetResponseProp4 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs index 93c6c9b2ea0..e5d76b59770 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class MixedLiteralsCases : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.cs index 01cac2f7388..3861282b549 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedLiteralsCases.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Union.Models +namespace _Type.Union { public partial class MixedLiteralsCases { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs index 72a515b7147..740f0da12de 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class MixedTypesCases : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.cs index 0af90a25216..7d4dfca9317 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/MixedTypesCases.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Union.Models +namespace _Type.Union { public partial class MixedTypesCases { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs index 1bc5a09ac04..cd8145b02e8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Type.Union.Models +namespace _Type.Union { public partial class StringAndArrayCases : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.cs index 264d6cccd28..a6f84c36aca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringAndArrayCases.cs @@ -4,7 +4,7 @@ using System; -namespace _Type.Union.Models +namespace _Type.Union { public partial class StringAndArrayCases { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringExtensibleNamedUnion.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringExtensibleNamedUnion.cs index d333af3de5e..f0e6540d729 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringExtensibleNamedUnion.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/Models/StringExtensibleNamedUnion.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; -namespace _Type.Union.Models +namespace _Type.Union { public readonly partial struct StringExtensibleNamedUnion : IEquatable { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/ModelsOnly.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/ModelsOnly.cs index 8eb665a4150..db934c286ae 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/ModelsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/ModelsOnly.cs @@ -7,7 +7,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringAndArray.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringAndArray.cs index e0152cd1815..977e91b8717 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringAndArray.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringAndArray.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensible.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensible.cs index 414c87dc27e..a159c322631 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensible.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensible.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensibleNamed.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensibleNamed.cs index 657248d6807..619c58d5d78 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensibleNamed.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringExtensibleNamed.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringsOnly.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringsOnly.cs index 5b3707a82a5..db492aa9632 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringsOnly.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/StringsOnly.cs @@ -6,7 +6,6 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using _Type.Union.Models; namespace _Type.Union { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/TypeUnionModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/TypeUnionModelFactory.cs index 680a58a441c..d592080c361 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/TypeUnionModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Generated/TypeUnionModelFactory.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace _Type.Union.Models +namespace _Type.Union { public static partial class TypeUnionModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/_Type.Scalar.csproj b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Type.Union.csproj similarity index 65% rename from packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/_Type.Scalar.csproj rename to packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Type.Union.csproj index 71c54c04b79..f8067e3e288 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/scalar/src/_Type.Scalar.csproj +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/src/Type.Union.csproj @@ -1,9 +1,9 @@ - This is the _Type.Scalar client library for developing .NET applications with rich experience. - SDK Code Generation _Type.Scalar + This is the Type.Union client library for developing .NET applications with rich experience. + SDK Code Generation Type.Union 1.0.0-beta.1 - _Type.Scalar + Type.Union netstandard2.0 latest true diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/tspCodeModel.json index 3dd126df5df..36d612abb52 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/union/tspCodeModel.json @@ -85,6 +85,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -138,6 +139,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -208,6 +210,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -278,6 +281,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -331,6 +335,7 @@ "decorators": [] } ], + "clientNamespace": "Type.Union", "isFixed": false, "isFlags": false, "usage": "Input,Output,Json", @@ -384,6 +389,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": false, "isFlags": false, "usage": "Input,Output,Json", @@ -454,6 +460,7 @@ "decorators": [] } ], + "clientNamespace": "", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -465,6 +472,7 @@ "$id": "54", "kind": "model", "name": "GetResponse", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -478,6 +486,7 @@ "$id": "56", "kind": "model", "name": "MixedTypesCases", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.MixedTypesCases", "usage": "Input,Output,Json", "decorators": [], @@ -497,6 +506,7 @@ "$id": "59", "kind": "model", "name": "Cat", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.Cat", "usage": "Input,Output,Json", "decorators": [], @@ -557,6 +567,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -700,6 +711,7 @@ "$id": "85", "kind": "model", "name": "SendRequest", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -732,6 +744,7 @@ "$id": "89", "kind": "model", "name": "GetResponse1", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -745,6 +758,7 @@ "$id": "91", "kind": "model", "name": "MixedLiteralsCases", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.MixedLiteralsCases", "usage": "Input,Output,Json", "decorators": [], @@ -813,6 +827,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -923,6 +938,7 @@ "$id": "115", "kind": "model", "name": "SendRequest1", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -955,6 +971,7 @@ "$id": "119", "kind": "model", "name": "GetResponse2", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -968,6 +985,7 @@ "$id": "121", "kind": "model", "name": "StringAndArrayCases", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.StringAndArrayCases", "usage": "Input,Output,Json", "decorators": [], @@ -1005,6 +1023,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -1054,6 +1073,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -1095,6 +1115,7 @@ "$id": "138", "kind": "model", "name": "SendRequest2", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1127,6 +1148,7 @@ "$id": "142", "kind": "model", "name": "GetResponse3", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1140,6 +1162,7 @@ "$id": "144", "kind": "model", "name": "EnumsOnlyCases", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.EnumsOnlyCases", "usage": "Input,Output,Json", "decorators": [], @@ -1215,6 +1238,7 @@ "$id": "153", "kind": "model", "name": "SendRequest3", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1247,6 +1271,7 @@ "$id": "157", "kind": "model", "name": "GetResponse4", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1268,6 +1293,7 @@ "$id": "160", "kind": "model", "name": "Dog", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.Dog", "usage": "Input,Output,Json", "decorators": [], @@ -1301,6 +1327,7 @@ ] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -1326,6 +1353,7 @@ "$id": "167", "kind": "model", "name": "SendRequest4", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1358,6 +1386,7 @@ "$id": "171", "kind": "model", "name": "GetResponse5", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1390,6 +1419,7 @@ "$id": "175", "kind": "model", "name": "SendRequest5", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1422,6 +1452,7 @@ "$id": "179", "kind": "model", "name": "GetResponse6", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1454,6 +1485,7 @@ "$id": "183", "kind": "model", "name": "SendRequest6", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1486,6 +1518,7 @@ "$id": "187", "kind": "model", "name": "GetResponse7", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1518,6 +1551,7 @@ "$id": "191", "kind": "model", "name": "SendRequest7", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1550,6 +1584,7 @@ "$id": "195", "kind": "model", "name": "GetResponse8", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1582,6 +1617,7 @@ "$id": "199", "kind": "model", "name": "SendRequest8", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1614,6 +1650,7 @@ "$id": "203", "kind": "model", "name": "GetResponse9", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.get.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -1646,6 +1683,7 @@ "$id": "207", "kind": "model", "name": "SendRequest9", + "clientNamespace": "Type.Union", "crossLanguageDefinitionId": "Type.Union.send.Request.anonymous", "usage": "Spread,Json", "decorators": [], @@ -1679,6 +1717,7 @@ { "$id": "211", "Name": "UnionClient", + "ClientNamespace": "Type.Union", "Doc": "Describe scenarios for various combinations of unions.", "Operations": [], "Protocol": { @@ -1722,6 +1761,7 @@ { "$id": "217", "Name": "StringsOnly", + "ClientNamespace": "Type.Union", "Doc": "Describe union of string \"a\" | \"b\" | \"c\"", "Operations": [ { @@ -1904,6 +1944,7 @@ { "$id": "234", "Name": "StringExtensible", + "ClientNamespace": "Type.Union", "Doc": "Describe union of string string | \"b\" | \"c\"", "Operations": [ { @@ -2086,6 +2127,7 @@ { "$id": "251", "Name": "StringExtensibleNamed", + "ClientNamespace": "Type.Union", "Doc": "Describe union of string string | \"b\" | \"c\" but where the union is named and some of the variants are named", "Operations": [ { @@ -2268,6 +2310,7 @@ { "$id": "268", "Name": "IntsOnly", + "ClientNamespace": "Type.Union", "Doc": "Describe union of integer 1 | 2 | 3", "Operations": [ { @@ -2450,6 +2493,7 @@ { "$id": "285", "Name": "FloatsOnly", + "ClientNamespace": "Type.Union", "Doc": "Describe union of floats 1.1 | 2.2 | 3.3", "Operations": [ { @@ -2632,6 +2676,7 @@ { "$id": "302", "Name": "ModelsOnly", + "ClientNamespace": "Type.Union", "Doc": "Describe union of models", "Operations": [ { @@ -2814,6 +2859,7 @@ { "$id": "319", "Name": "EnumsOnly", + "ClientNamespace": "Type.Union", "Doc": "Describe union of 2 different enums", "Operations": [ { @@ -2996,6 +3042,7 @@ { "$id": "336", "Name": "StringAndArray", + "ClientNamespace": "Type.Union", "Doc": "Describe union of a string and an array of strings", "Operations": [ { @@ -3178,6 +3225,7 @@ { "$id": "353", "Name": "MixedLiterals", + "ClientNamespace": "Type.Union", "Doc": "Describe union of floats \"a\" | 2 | 3.3", "Operations": [ { @@ -3360,6 +3408,7 @@ { "$id": "370", "Name": "MixedTypes", + "ClientNamespace": "Type.Union", "Doc": "Describe union of floats \"a\" | 2 | 3.3", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/Configuration.json index b9cfde991f2..4ca5e057428 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.Added.V1", + "namespace": "Versioning.Added", "library-name": "Versioning.Added.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs index c0e65f7fb4c..4f240a760b1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Added.V1.Models; -namespace Versioning.Added.V1 +namespace Versioning.Added { public partial class AddedClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs index dfa740aaebb..773ddd6c34e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.Added.V1 +namespace Versioning.Added { public partial class AddedClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..93537669255 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..b39488bef28 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..c42bac6fe78 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..1897a5ee1e8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/EnumV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/EnumV1.cs index 05170f3d408..a0b7804d681 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/EnumV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/EnumV1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Added.V1.Models +namespace Versioning.Added { public enum EnumV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs index 436a07dffa5..0a2b7c06d0b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Added.V1.Models +namespace Versioning.Added { public partial class ModelV1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.cs index 6137596f1fd..a720dab8507 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/Models/ModelV1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Added.V1.Models +namespace Versioning.Added { public partial class ModelV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/VersioningAddedV1ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/VersioningAddedV1ModelFactory.cs index 5ab472a4906..d0396c8f9e5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/VersioningAddedV1ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/src/Generated/VersioningAddedV1ModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Added.V1.Models +namespace Versioning.Added { public static partial class VersioningAddedV1ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/tspCodeModel.json index 40a3a228c33..50563599359 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v1/tspCodeModel.json @@ -36,6 +36,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -73,6 +74,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -85,6 +87,7 @@ "$id": "10", "kind": "model", "name": "ModelV1", + "clientNamespace": "Versioning.Added", "crossLanguageDefinitionId": "Versioning.Added.ModelV1", "usage": "Input,Output,Json", "decorators": [], @@ -144,6 +147,7 @@ { "$id": "18", "Name": "AddedClient", + "ClientNamespace": "Versioning.Added", "Doc": "Test for the `@added` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/Configuration.json index bff877fa0d8..a75cb13080d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.Added.V2", + "namespace": "Versioning.Added", "library-name": "Versioning.Added.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClient.cs index acbc40ab5d6..15c9f8e666d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Added.V2.Models; -namespace Versioning.Added.V2 +namespace Versioning.Added { public partial class AddedClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClientOptions.cs index 8687c4616d4..e2f29f0a557 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/AddedClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.Added.V2 +namespace Versioning.Added { public partial class AddedClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/InterfaceV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/InterfaceV2.cs index fb097982e05..cef6e78f45d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/InterfaceV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/InterfaceV2.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Added.V2.Models; -namespace Versioning.Added.V2 +namespace Versioning.Added { public partial class InterfaceV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..93537669255 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..b39488bef28 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..c42bac6fe78 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..1897a5ee1e8 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Added +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV1.cs index 2d412c58dc8..77b04d30556 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public enum EnumV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV2.cs index 3d8cc2c1539..bb8fe336bd3 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/EnumV2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public enum EnumV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs index 0fe0495bf12..0a2b7c06d0b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public partial class ModelV1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.cs index 7cf4187c0d8..9ecbe0b8a0d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV1.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public partial class ModelV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs index cbebd413c62..a3d66e20e46 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public partial class ModelV2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.cs index dfc25666085..984f54da7e0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/Models/ModelV2.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public partial class ModelV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/VersioningAddedV2ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/VersioningAddedV2ModelFactory.cs index 5bc2843e9b7..39fc2643e98 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/VersioningAddedV2ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/src/Generated/VersioningAddedV2ModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Added.V2.Models +namespace Versioning.Added { public static partial class VersioningAddedV2ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/tspCodeModel.json index 912fb88dac5..454cae01fe0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/added/v2/tspCodeModel.json @@ -54,6 +54,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -90,6 +91,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -145,6 +147,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -157,6 +160,7 @@ "$id": "18", "kind": "model", "name": "ModelV1", + "clientNamespace": "Versioning.Added", "crossLanguageDefinitionId": "Versioning.Added.ModelV1", "usage": "Input,Output,Json", "decorators": [], @@ -241,6 +245,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "decorators": [] }, "optional": false, @@ -263,6 +268,7 @@ "$id": "33", "kind": "model", "name": "ModelV2", + "clientNamespace": "Versioning.Added", "crossLanguageDefinitionId": "Versioning.Added.ModelV2", "usage": "Input,Output,Json", "decorators": [], @@ -340,6 +346,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Added", "decorators": [] }, "optional": false, @@ -363,6 +370,7 @@ { "$id": "47", "Name": "AddedClient", + "ClientNamespace": "Versioning.Added", "Doc": "Test for the `@added` decorator.", "Operations": [ { @@ -654,6 +662,7 @@ { "$id": "72", "Name": "InterfaceV2", + "ClientNamespace": "Versioning.Added", "Operations": [ { "$id": "73", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/Configuration.json index 075fb9dc6a6..90db472a10c 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.MadeOptional.V1", + "namespace": "Versioning.MadeOptional", "library-name": "Versioning.MadeOptional.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..1ef30dc9272 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..4b8933cdb42 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..53dd8a0f5be --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4fcfb130757 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs index c8a62475a72..8594bc90f75 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.MadeOptional.V1.Models; -namespace Versioning.MadeOptional.V1 +namespace Versioning.MadeOptional { public partial class MadeOptionalClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs index b8c4012f7a4..3eefb1ff588 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.MadeOptional.V1 +namespace Versioning.MadeOptional { public partial class MadeOptionalClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs index a9bb4866bbf..f5f41f08fff 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.MadeOptional.V1.Models +namespace Versioning.MadeOptional { public partial class TestModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.cs index 75198e80714..eca2fc80f1d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.MadeOptional.V1.Models +namespace Versioning.MadeOptional { public partial class TestModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/VersioningMadeOptionalV1ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/VersioningMadeOptionalV1ModelFactory.cs index d0949041b07..1c65d058272 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/VersioningMadeOptionalV1ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/src/Generated/VersioningMadeOptionalV1ModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.MadeOptional.V1.Models +namespace Versioning.MadeOptional { public static partial class VersioningMadeOptionalV1ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/tspCodeModel.json index 5df915f1f7f..5fdeb504396 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v1/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.MadeOptional", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -49,6 +50,7 @@ "$id": "6", "kind": "model", "name": "TestModel", + "clientNamespace": "Versioning.MadeOptional", "crossLanguageDefinitionId": "Versioning.MadeOptional.TestModel", "usage": "Input,Output,Json", "decorators": [], @@ -112,6 +114,7 @@ { "$id": "15", "Name": "MadeOptionalClient", + "ClientNamespace": "Versioning.MadeOptional", "Doc": "Test for the `@madeOptional` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/Configuration.json index 94859eb9366..9f3d8411547 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.MadeOptional.V2", + "namespace": "Versioning.MadeOptional", "library-name": "Versioning.MadeOptional.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..1ef30dc9272 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..4b8933cdb42 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..53dd8a0f5be --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4fcfb130757 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.MadeOptional +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs index 24ee4a33654..080788c4655 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.MadeOptional.V2.Models; -namespace Versioning.MadeOptional.V2 +namespace Versioning.MadeOptional { public partial class MadeOptionalClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs index 0a436416564..f328701bf0d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/MadeOptionalClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.MadeOptional.V2 +namespace Versioning.MadeOptional { public partial class MadeOptionalClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs index 9700a3d60a8..f5f41f08fff 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.MadeOptional.V2.Models +namespace Versioning.MadeOptional { public partial class TestModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.cs index f9cd13dcef9..770f3598c4b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/Models/TestModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.MadeOptional.V2.Models +namespace Versioning.MadeOptional { public partial class TestModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/VersioningMadeOptionalV2ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/VersioningMadeOptionalV2ModelFactory.cs index 402201f28b3..edb1e8e8607 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/VersioningMadeOptionalV2ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/src/Generated/VersioningMadeOptionalV2ModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.MadeOptional.V2.Models +namespace Versioning.MadeOptional { public static partial class VersioningMadeOptionalV2ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/tspCodeModel.json index adcd1c38b94..1e125a802f7 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/madeOptional/v2/tspCodeModel.json @@ -56,6 +56,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.MadeOptional", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -68,6 +69,7 @@ "$id": "8", "kind": "model", "name": "TestModel", + "clientNamespace": "Versioning.MadeOptional", "crossLanguageDefinitionId": "Versioning.MadeOptional.TestModel", "usage": "Input,Output,Json", "decorators": [], @@ -131,6 +133,7 @@ { "$id": "17", "Name": "MadeOptionalClient", + "ClientNamespace": "Versioning.MadeOptional", "Doc": "Test for the `@madeOptional` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/Configuration.json index 823ae49a5bd..221b2fbb1ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.Removed.V1", + "namespace": "Versioning.Removed", "library-name": "Versioning.Removed.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs index 6872adbaa1b..d3656e7c8d6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Removed.V1.Models; -namespace Versioning.Removed.V1 +namespace Versioning.Removed { public partial class InterfaceV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a9c365e6ce5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d7f6a26442c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..b6c97977a26 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..7e54a97c32e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV1.cs index 45d0b8bab4a..309c45b2dca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public enum EnumV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV2.cs index b94ada2865b..7d01a7fa523 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public enum EnumV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV3.cs index 9ad41447df8..6273de0b009 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/EnumV3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public enum EnumV3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs index 73ac5f911cb..3845eb6fd60 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.cs index 306c82a5462..43359b8c9bf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV1.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs index b7f4ded0af9..b8d0ac0102e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.cs index f2e845b378b..b6ec2572ef9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV2.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs index 5afd00fe9c7..dff2a3b6129 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV3 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.cs index e876028af3f..9ecd0671c66 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/Models/ModelV3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public partial class ModelV3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs index 22e266f457f..9d7b39f1c89 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Removed.V1.Models; -namespace Versioning.Removed.V1 +namespace Versioning.Removed { public partial class RemovedClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs index 2de32d0413a..6389ac97d10 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.Removed.V1 +namespace Versioning.Removed { public partial class RemovedClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/VersioningRemovedV1ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/VersioningRemovedV1ModelFactory.cs index 379538bf7da..0c1e6c923d1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/VersioningRemovedV1ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/src/Generated/VersioningRemovedV1ModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V1.Models +namespace Versioning.Removed { public static partial class VersioningRemovedV1ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/tspCodeModel.json index d540ddcac0f..518afbf69f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v1/tspCodeModel.json @@ -36,6 +36,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -89,6 +90,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -142,6 +144,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -179,6 +182,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -191,6 +195,7 @@ "$id": "22", "kind": "model", "name": "ModelV1", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV1", "usage": "Input,Output,Json", "decorators": [], @@ -268,6 +273,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "decorators": [] }, "optional": false, @@ -290,6 +296,7 @@ "$id": "36", "kind": "model", "name": "ModelV2", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV2", "usage": "Input,Output,Json", "decorators": [], @@ -407,6 +414,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "decorators": [] }, "optional": false, @@ -429,6 +437,7 @@ "$id": "56", "kind": "model", "name": "ModelV3", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV3", "usage": "Input,Output,Json", "decorators": [], @@ -488,6 +497,7 @@ { "$id": "64", "Name": "RemovedClient", + "ClientNamespace": "Versioning.Removed", "Doc": "Test for the `@removed` decorator.", "Operations": [ { @@ -890,6 +900,7 @@ { "$id": "98", "Name": "InterfaceV1", + "ClientNamespace": "Versioning.Removed", "Doc": "This operation group should not be generated with latest version.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/Configuration.json index 9f9b8fb03a4..9dbfa2a454a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.Removed.V2", + "namespace": "Versioning.Removed", "library-name": "Versioning.Removed.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a9c365e6ce5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d7f6a26442c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..b6c97977a26 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..7e54a97c32e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV2.cs index 9eef86c9ec5..26daa13e32b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public enum EnumV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV3.cs index 2817ca87e2c..6273de0b009 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/EnumV3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public enum EnumV3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs index 190a3007b43..b8d0ac0102e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public partial class ModelV2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.cs index 2e463ef9681..7bb283ef948 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV2.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public partial class ModelV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs index 7ac06e47ac1..dff2a3b6129 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public partial class ModelV3 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.cs index 048d197acb5..9ecd0671c66 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/Models/ModelV3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public partial class ModelV3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClient.cs index d5c685403e9..febf2295a42 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Removed.V2.Models; -namespace Versioning.Removed.V2 +namespace Versioning.Removed { public partial class RemovedClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs index 023894aadc9..4925a16b6eb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/RemovedClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.Removed.V2 +namespace Versioning.Removed { public partial class RemovedClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/VersioningRemovedV2ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/VersioningRemovedV2ModelFactory.cs index 9eeb0097734..2d6d488f186 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/VersioningRemovedV2ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/src/Generated/VersioningRemovedV2ModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V2.Models +namespace Versioning.Removed { public static partial class VersioningRemovedV2ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/tspCodeModel.json index f88bf41f2c6..e08abde8cb1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2/tspCodeModel.json @@ -38,6 +38,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -91,6 +92,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -164,6 +166,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -176,6 +179,7 @@ "$id": "20", "kind": "model", "name": "ModelV2", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV2", "usage": "Input,Output,Json", "decorators": [], @@ -253,6 +257,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "decorators": [] }, "optional": false, @@ -275,6 +280,7 @@ "$id": "34", "kind": "model", "name": "ModelV3", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV3", "usage": "Input,Output,Json", "decorators": [], @@ -334,6 +340,7 @@ { "$id": "42", "Name": "RemovedClient", + "ClientNamespace": "Versioning.Removed", "Doc": "Test for the `@removed` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/Configuration.json index 9608f6118bd..87e6417dd88 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.Removed.V2Preview", + "namespace": "Versioning.Removed", "library-name": "Versioning.Removed.V2Preview" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs index e9c63b510a5..d3656e7c8d6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/InterfaceV1.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Removed.V2Preview.Models; -namespace Versioning.Removed.V2Preview +namespace Versioning.Removed { public partial class InterfaceV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..a9c365e6ce5 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d7f6a26442c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..b6c97977a26 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..7e54a97c32e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.Removed +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV1.cs index 625f364b533..309c45b2dca 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV1.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public enum EnumV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV2.cs index 01e528b7e29..7d01a7fa523 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/EnumV2.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public enum EnumV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs index 5aebb540603..3845eb6fd60 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV1 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.cs index 1f217d8ee77..43359b8c9bf 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV1.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV1 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs index 323f8225f1d..b8d0ac0102e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV2 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.cs index f1927fa0b90..b6ec2572ef9 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV2.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV2 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs index de9f33ae5fe..dff2a3b6129 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV3 : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.cs index cd06f24f035..ebf632edd0d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/Models/ModelV3.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public partial class ModelV3 { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs index 75322a57196..9d7b39f1c89 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.Removed.V2Preview.Models; -namespace Versioning.Removed.V2Preview +namespace Versioning.Removed { public partial class RemovedClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs index c56facf86cf..43faac8d671 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/RemovedClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.Removed.V2Preview +namespace Versioning.Removed { public partial class RemovedClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/VersioningRemovedV2PreviewModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/VersioningRemovedV2PreviewModelFactory.cs index a22d365b092..de9c39d898e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/VersioningRemovedV2PreviewModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/src/Generated/VersioningRemovedV2PreviewModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.Removed.V2Preview.Models +namespace Versioning.Removed { public static partial class VersioningRemovedV2PreviewModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/tspCodeModel.json index 4a623f63d37..0e57cf5841e 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/removed/v2Preview/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -90,6 +91,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -145,6 +147,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -157,6 +160,7 @@ "$id": "18", "kind": "model", "name": "ModelV1", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV1", "usage": "Input,Output,Json", "decorators": [], @@ -234,6 +238,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "decorators": [] }, "optional": false, @@ -256,6 +261,7 @@ "$id": "32", "kind": "model", "name": "ModelV2", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV2", "usage": "Input,Output,Json", "decorators": [], @@ -373,6 +379,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.Removed", "decorators": [] }, "optional": false, @@ -395,6 +402,7 @@ "$id": "52", "kind": "model", "name": "ModelV3", + "clientNamespace": "Versioning.Removed", "crossLanguageDefinitionId": "Versioning.Removed.ModelV3", "usage": "Input,Output,Json", "decorators": [], @@ -432,6 +440,7 @@ { "$id": "57", "Name": "RemovedClient", + "ClientNamespace": "Versioning.Removed", "Doc": "Test for the `@removed` decorator.", "Operations": [ { @@ -834,6 +843,7 @@ { "$id": "91", "Name": "InterfaceV1", + "ClientNamespace": "Versioning.Removed", "Doc": "This operation group should not be generated with latest version.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/Configuration.json index 00c7569ad52..4a58b01569a 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.RenamedFrom.V1", + "namespace": "Versioning.RenamedFrom", "library-name": "Versioning.RenamedFrom.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..10344274a60 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..4e0aa550513 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..3bcf74d2118 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..ca50a34e501 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldEnum.cs index 7aa1dd1e4f7..711b1324a3d 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.RenamedFrom.V1.Models +namespace Versioning.RenamedFrom { public enum OldEnum { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs index 2700fdf5a11..8b83c9c6770 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.RenamedFrom.V1.Models +namespace Versioning.RenamedFrom { public partial class OldModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.cs index f897691e26b..879c53fa260 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/Models/OldModel.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.RenamedFrom.V1.Models +namespace Versioning.RenamedFrom { public partial class OldModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs index 75760719b99..27d6fdcc629 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/OldInterface.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.RenamedFrom.V1.Models; -namespace Versioning.RenamedFrom.V1 +namespace Versioning.RenamedFrom { public partial class OldInterface { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs index 282c86d4810..d65af3f3675 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.RenamedFrom.V1.Models; -namespace Versioning.RenamedFrom.V1 +namespace Versioning.RenamedFrom { public partial class RenamedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs index 82aade9d370..079e9e380f8 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.RenamedFrom.V1 +namespace Versioning.RenamedFrom { public partial class RenamedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/VersioningRenamedFromV1ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/VersioningRenamedFromV1ModelFactory.cs index 38cf8bb6bbc..3ecb3043735 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/VersioningRenamedFromV1ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/src/Generated/VersioningRenamedFromV1ModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.RenamedFrom.V1.Models +namespace Versioning.RenamedFrom { public static partial class VersioningRenamedFromV1ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/tspCodeModel.json index 7f6762ad600..0617c344ee1 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v1/tspCodeModel.json @@ -36,6 +36,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -73,6 +74,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -85,6 +87,7 @@ "$id": "10", "kind": "model", "name": "OldModel", + "clientNamespace": "Versioning.RenamedFrom", "crossLanguageDefinitionId": "Versioning.RenamedFrom.OldModel", "usage": "Input,Output,Json", "decorators": [], @@ -169,6 +172,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "decorators": [] }, "optional": false, @@ -192,6 +196,7 @@ { "$id": "25", "Name": "RenamedFromClient", + "ClientNamespace": "Versioning.RenamedFrom", "Doc": "Test for the `@renamedFrom` decorator.", "Operations": [ { @@ -374,6 +379,7 @@ { "$id": "41", "Name": "OldInterface", + "ClientNamespace": "Versioning.RenamedFrom", "Operations": [ { "$id": "42", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/Configuration.json index e015ab0e36d..72401dd3891 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.RenamedFrom.V2", + "namespace": "Versioning.RenamedFrom", "library-name": "Versioning.RenamedFrom.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..10344274a60 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..4e0aa550513 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..3bcf74d2118 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..ca50a34e501 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.RenamedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewEnum.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewEnum.cs index da46a6b1137..6403661d637 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.RenamedFrom.V2.Models +namespace Versioning.RenamedFrom { public enum NewEnum { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs index 0187a881feb..aa08009f5a5 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.RenamedFrom.V2.Models +namespace Versioning.RenamedFrom { public partial class NewModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.cs index 4c430c9229b..369646c7b26 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/Models/NewModel.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.RenamedFrom.V2.Models +namespace Versioning.RenamedFrom { public partial class NewModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs index 6c1edad7bf6..959c7a48106 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/NewInterface.cs @@ -6,9 +6,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.RenamedFrom.V2.Models; -namespace Versioning.RenamedFrom.V2 +namespace Versioning.RenamedFrom { public partial class NewInterface { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs index 5aafccf90c0..6c6eb4de56b 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.RenamedFrom.V2.Models; -namespace Versioning.RenamedFrom.V2 +namespace Versioning.RenamedFrom { public partial class RenamedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs index f666e966cb6..7d99ad1eb2f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/RenamedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.RenamedFrom.V2 +namespace Versioning.RenamedFrom { public partial class RenamedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/VersioningRenamedFromV2ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/VersioningRenamedFromV2ModelFactory.cs index 78a40258b24..7e103b811a4 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/VersioningRenamedFromV2ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/src/Generated/VersioningRenamedFromV2ModelFactory.cs @@ -4,7 +4,7 @@ using System; -namespace Versioning.RenamedFrom.V2.Models +namespace Versioning.RenamedFrom { public static partial class VersioningRenamedFromV2ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/tspCodeModel.json index 8a00c852276..cfb82102449 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/renamedFrom/v2/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "isFixed": true, "isFlags": false, "usage": "Input,Output,Json", @@ -92,6 +93,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -104,6 +106,7 @@ "$id": "12", "kind": "model", "name": "NewModel", + "clientNamespace": "Versioning.RenamedFrom", "crossLanguageDefinitionId": "Versioning.RenamedFrom.NewModel", "usage": "Input,Output,Json", "decorators": [], @@ -188,6 +191,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.RenamedFrom", "decorators": [] }, "optional": false, @@ -211,6 +215,7 @@ { "$id": "27", "Name": "RenamedFromClient", + "ClientNamespace": "Versioning.RenamedFrom", "Doc": "Test for the `@renamedFrom` decorator.", "Operations": [ { @@ -393,6 +398,7 @@ { "$id": "43", "Name": "NewInterface", + "ClientNamespace": "Versioning.RenamedFrom", "Operations": [ { "$id": "44", diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/Configuration.json index 56b688d6509..7f5ddbc8dfb 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.ReturnTypeChangedFrom.V1", + "namespace": "Versioning.ReturnTypeChangedFrom", "library-name": "Versioning.ReturnTypeChangedFrom.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..4c71235006e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d6a656228fb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0f4e75cc588 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4d204358366 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs index f07d9147cc2..aa02fb0c6aa 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Versioning.ReturnTypeChangedFrom.V1 +namespace Versioning.ReturnTypeChangedFrom { public partial class ReturnTypeChangedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs index 99f5fb8d6e8..e8bee0a6323 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.ReturnTypeChangedFrom.V1 +namespace Versioning.ReturnTypeChangedFrom { public partial class ReturnTypeChangedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json index 4e0e15a35b7..49aafbaea51 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v1/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.ReturnTypeChangedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -49,6 +50,7 @@ { "$id": "6", "Name": "ReturnTypeChangedFromClient", + "ClientNamespace": "Versioning.ReturnTypeChangedFrom", "Doc": "Test for the `@returnTypeChangedFrom` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/Configuration.json index 6e1d8123581..0745b9d6c09 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.ReturnTypeChangedFrom.V2", + "namespace": "Versioning.ReturnTypeChangedFrom", "library-name": "Versioning.ReturnTypeChangedFrom.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..4c71235006e --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..d6a656228fb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0f4e75cc588 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..4d204358366 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.ReturnTypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs index 26bed9a2857..59f110a0c55 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClient.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Versioning.ReturnTypeChangedFrom.V2 +namespace Versioning.ReturnTypeChangedFrom { public partial class ReturnTypeChangedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs index 800d45414c2..b6d5d3ef543 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/src/Generated/ReturnTypeChangedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.ReturnTypeChangedFrom.V2 +namespace Versioning.ReturnTypeChangedFrom { public partial class ReturnTypeChangedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json index 7202d682cd7..da7afaa0c7f 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/returnTypeChangedFrom/v2/tspCodeModel.json @@ -56,6 +56,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.ReturnTypeChangedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -68,6 +69,7 @@ { "$id": "8", "Name": "ReturnTypeChangedFromClient", + "ClientNamespace": "Versioning.ReturnTypeChangedFrom", "Doc": "Test for the `@returnTypeChangedFrom` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/Configuration.json index 08f7f7ce959..1d32eadf173 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.TypeChangedFrom.V1", + "namespace": "Versioning.TypeChangedFrom", "library-name": "Versioning.TypeChangedFrom.V1" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..476f129b28c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..85bd0607257 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0770a6095dd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6208c93f4bb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs index 885d18dcb4a..5e9baf83723 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.TypeChangedFrom.V1.Models +namespace Versioning.TypeChangedFrom { public partial class TestModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.cs index 1f103a30b86..df9fb032380 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.TypeChangedFrom.V1.Models +namespace Versioning.TypeChangedFrom { public partial class TestModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs index 862cabbd801..9346a44e163 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.TypeChangedFrom.V1.Models; -namespace Versioning.TypeChangedFrom.V1 +namespace Versioning.TypeChangedFrom { public partial class TypeChangedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs index 517b7fd75a2..e335851e9c0 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.TypeChangedFrom.V1 +namespace Versioning.TypeChangedFrom { public partial class TypeChangedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/VersioningTypeChangedFromV1ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/VersioningTypeChangedFromV1ModelFactory.cs index 791f334b850..36e6de0e9e6 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/VersioningTypeChangedFromV1ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/VersioningTypeChangedFromV1ModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.TypeChangedFrom.V1.Models +namespace Versioning.TypeChangedFrom { public static partial class VersioningTypeChangedFromV1ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/tspCodeModel.json index 0a2b1215a31..07563d25eb2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v1/tspCodeModel.json @@ -37,6 +37,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.TypeChangedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -49,6 +50,7 @@ "$id": "6", "kind": "model", "name": "TestModel", + "clientNamespace": "Versioning.TypeChangedFrom", "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.TestModel", "usage": "Input,Output,Json", "decorators": [], @@ -112,6 +114,7 @@ { "$id": "15", "Name": "TypeChangedFromClient", + "ClientNamespace": "Versioning.TypeChangedFrom", "Doc": "Test for the `@typeChangedFrom` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/Configuration.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/Configuration.json index 0ef5f0990ea..cddf7df0702 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/Configuration.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/Configuration.json @@ -1,5 +1,5 @@ { "output-folder": ".", - "namespace": "Versioning.TypeChangedFrom.V2", + "namespace": "Versioning.TypeChangedFrom", "library-name": "Versioning.TypeChangedFrom.V2" } diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs new file mode 100644 index 00000000000..476f129b28c --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenMemberAttribute.cs @@ -0,0 +1,16 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))] + internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute + { + public CodeGenMemberAttribute(string originalName) : base(originalName) + { + } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs new file mode 100644 index 00000000000..85bd0607257 --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSerializationAttribute.cs @@ -0,0 +1,42 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)] + internal partial class CodeGenSerializationAttribute : Attribute + { + public CodeGenSerializationAttribute(string propertyName) + { + PropertyName = propertyName; + } + + public CodeGenSerializationAttribute(string propertyName, string propertySerializationName) + { + PropertyName = propertyName; + PropertySerializationName = propertySerializationName; + } + + /// Gets or sets the property name which these hooks should apply to. + public string PropertyName { get; } + + /// Gets or sets the serialization name of the property. + public string PropertySerializationName { get; set; } + + /// + /// Gets or sets the method name to use when serializing the property value (property name excluded). + /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer); + /// + public string SerializationValueHook { get; set; } + + /// + /// Gets or sets the method name to use when deserializing the property value from the JSON. + /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required + /// private static void DeserializationHook(JsonProperty property, ref Optional<TypeOfTheProperty> propertyValue); // if the property is optional + /// + public string DeserializationValueHook { get; set; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs new file mode 100644 index 00000000000..0770a6095dd --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenSuppressAttribute.cs @@ -0,0 +1,24 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)] + internal partial class CodeGenSuppressAttribute : Attribute + { + public CodeGenSuppressAttribute(string member, params Type[] parameters) + { + Member = member; + Parameters = parameters; + } + + /// Gets the Member. + public string Member { get; } + + /// Gets the Parameters. + public Type[] Parameters { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs new file mode 100644 index 00000000000..6208c93f4bb --- /dev/null +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Internal/CodeGenTypeAttribute.cs @@ -0,0 +1,20 @@ +// + +#nullable disable + +using System; + +namespace Versioning.TypeChangedFrom +{ + [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct))] + internal partial class CodeGenTypeAttribute : Attribute + { + public CodeGenTypeAttribute(string originalName) + { + OriginalName = originalName; + } + + /// Gets the OriginalName. + public string OriginalName { get; } + } +} diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs index 97154287b7f..5e9baf83723 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.Serialization.cs @@ -7,7 +7,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace Versioning.TypeChangedFrom.V2.Models +namespace Versioning.TypeChangedFrom { public partial class TestModel : IJsonModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.cs index 4312b1165b2..01b497f2cc2 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/Models/TestModel.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.TypeChangedFrom.V2.Models +namespace Versioning.TypeChangedFrom { public partial class TestModel { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs index 5565c686583..4ac83f56d47 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClient.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Threading; using System.Threading.Tasks; -using Versioning.TypeChangedFrom.V2.Models; -namespace Versioning.TypeChangedFrom.V2 +namespace Versioning.TypeChangedFrom { public partial class TypeChangedFromClient { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs index 02a531c3d0d..bd3fa375597 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/TypeChangedFromClientOptions.cs @@ -4,7 +4,7 @@ using System.ClientModel.Primitives; -namespace Versioning.TypeChangedFrom.V2 +namespace Versioning.TypeChangedFrom { public partial class TypeChangedFromClientOptions : ClientPipelineOptions { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/VersioningTypeChangedFromV2ModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/VersioningTypeChangedFromV2ModelFactory.cs index 403986f0125..913a33c4682 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/VersioningTypeChangedFromV2ModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/src/Generated/VersioningTypeChangedFromV2ModelFactory.cs @@ -2,7 +2,7 @@ #nullable disable -namespace Versioning.TypeChangedFrom.V2.Models +namespace Versioning.TypeChangedFrom { public static partial class VersioningTypeChangedFromV2ModelFactory { diff --git a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/tspCodeModel.json index 05fbfef19bd..ff7e4b5ed05 100644 --- a/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/versioning/typeChangedFrom/v2/tspCodeModel.json @@ -56,6 +56,7 @@ "decorators": [] } ], + "clientNamespace": "Versioning.TypeChangedFrom", "doc": "The version of the API.", "isFixed": true, "isFlags": false, @@ -68,6 +69,7 @@ "$id": "8", "kind": "model", "name": "TestModel", + "clientNamespace": "Versioning.TypeChangedFrom", "crossLanguageDefinitionId": "Versioning.TypeChangedFrom.TestModel", "usage": "Input,Output,Json", "decorators": [], @@ -131,6 +133,7 @@ { "$id": "17", "Name": "TypeChangedFromClient", + "ClientNamespace": "Versioning.TypeChangedFrom", "Doc": "Test for the `@typeChangedFrom` decorator.", "Operations": [ { diff --git a/packages/http-client-csharp/generator/TestProjects/Local.Tests/ExtensibleEnumTests.cs b/packages/http-client-csharp/generator/TestProjects/Local.Tests/ExtensibleEnumTests.cs index ca7f43a920c..453d8e85ecd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local.Tests/ExtensibleEnumTests.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local.Tests/ExtensibleEnumTests.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NUnit.Framework; -using UnbrandedTypeSpec.Models; +using UnbrandedTypeSpec; namespace TestProjects.Local.Tests { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.Serialization.cs index 956cb7a2dc0..ae9a72ee068 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct FloatExtensibleEnum diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs index 25284a5fb73..e5bc3a289bf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// Float based extensible enum. public readonly partial struct FloatExtensibleEnum : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.Serialization.cs index 88300214e28..1f1409e2cbf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct FloatExtensibleEnumWithIntValue diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs index 4b5a5b0dde1..0e81b73a8c1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// float fixed enum. public readonly partial struct FloatExtensibleEnumWithIntValue : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.Serialization.cs index 950c2a31def..d4cbbf4c3f4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.Serialization.cs @@ -4,7 +4,7 @@ using System; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { internal static partial class FloatFixedEnumExtensions { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.cs index eb665d9cde2..4a4067af710 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// float fixed enum. public enum FloatFixedEnum diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.Serialization.cs index 9c2c3552928..e13585c1cfa 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.Serialization.cs @@ -4,7 +4,7 @@ using System; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { internal static partial class FloatFixedEnumWithIntValueExtensions { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs index c436bf279fc..9cede50c4c9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// float fixed enum. public enum FloatFixedEnumWithIntValue diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.Serialization.cs index 5f92623cca6..061572634d4 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct IntExtensibleEnum diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs index efd9f25bf5d..9c690e93251 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// Int based extensible enum. public readonly partial struct IntExtensibleEnum : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.Serialization.cs index 54fa6026254..34d45283ee9 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.Serialization.cs @@ -4,7 +4,7 @@ using System; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { internal static partial class IntFixedEnumExtensions { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.cs index e46586149ef..aba46007971 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/IntFixedEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// int fixed enum. public enum IntFixedEnum diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs index 10947cbee2e..bfc45ecd97f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Collections.Generic; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public partial class ModelWithRequiredNullableProperties : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs index 3364e0ca710..cf00f0acde3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// A model with a few required nullable properties. public partial class ModelWithRequiredNullableProperties diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs index cd544aa164f..e8d664f0214 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Collections.Generic; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public partial class ReturnsAnonymousModelResponse : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs index 85b3a728ce0..df5bcbcb840 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The ReturnsAnonymousModelResponse. public partial class ReturnsAnonymousModelResponse diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs index c7a689755e0..b852cc5009c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Collections.Generic; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public partial class RoundTripModel : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.cs index 823824802c3..0828f42256c 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/RoundTripModel.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// this is a roundtrip model. public partial class RoundTripModel diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs index ece2c81625f..67412c7a281 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs @@ -4,9 +4,8 @@ using System; using System.ComponentModel; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// Extensible enum. public readonly partial struct StringExtensibleEnum : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.Serialization.cs index fb6e88e8ec6..690fc9222f6 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.Serialization.cs @@ -4,7 +4,7 @@ using System; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { internal static partial class StringFixedEnumExtensions { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.cs index 0698cbd34f2..df588d6b2bd 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/StringFixedEnum.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// Simple enum. public enum StringFixedEnum diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.Serialization.cs index 8ef12810fac..3bf540d9db0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.Serialization.cs @@ -7,9 +7,8 @@ using System.ClientModel.Primitives; using System.Collections.Generic; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public partial class Thing : IJsonModel diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.cs index 259c80783ac..f2ee96d4c04 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/Thing.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// A model with a few properties of literal types. public partial class Thing diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs index d9239e62906..181b907b230 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct ThingOptionalLiteralFloat diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.cs index b81f672a1e1..4e7950d41ee 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralFloat.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_optionalLiteralFloat. public readonly partial struct ThingOptionalLiteralFloat : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs index e498f97ed1e..4cf1a8bed7e 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct ThingOptionalLiteralInt diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.cs index 284dbdca2ac..3dda761b9ac 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralInt.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_optionalLiteralInt. public readonly partial struct ThingOptionalLiteralInt : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralString.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralString.cs index 0b0ed788758..febed99668b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingOptionalLiteralString.cs @@ -4,9 +4,8 @@ using System; using System.ComponentModel; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_optionalLiteralString. public readonly partial struct ThingOptionalLiteralString : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.Serialization.cs index c2b1deae37b..34b81bee2f0 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct ThingRequiredLiteralFloat diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.cs index 33d50712d46..11b2c926006 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralFloat.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_requiredLiteralFloat. public readonly partial struct ThingRequiredLiteralFloat : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.Serialization.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.Serialization.cs index d0e1af2a01a..ac125431fbf 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.Serialization.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.Serialization.cs @@ -2,7 +2,7 @@ #nullable disable -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// public readonly partial struct ThingRequiredLiteralInt diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.cs index a85304267e9..2d11f83501b 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralInt.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Globalization; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_requiredLiteralInt. public readonly partial struct ThingRequiredLiteralInt : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralString.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralString.cs index 4912aa9e087..00902612c08 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralString.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/Models/ThingRequiredLiteralString.cs @@ -4,9 +4,8 @@ using System; using System.ComponentModel; -using UnbrandedTypeSpec; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// The Thing_requiredLiteralString. public readonly partial struct ThingRequiredLiteralString : IEquatable diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs index 227c14c0d6d..bc3ed0b8eb1 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecClient.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using UnbrandedTypeSpec.Models; using UnbrandedTypeSpec.Models.Custom; namespace UnbrandedTypeSpec diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecModelFactory.cs b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecModelFactory.cs index 923b42580e7..8243f8f4f06 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecModelFactory.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/src/Generated/UnbrandedTypeSpecModelFactory.cs @@ -5,10 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; -using UnbrandedTypeSpec; using UnbrandedTypeSpec.Models.Custom; -namespace UnbrandedTypeSpec.Models +namespace UnbrandedTypeSpec { /// A factory class for creating instances of the models for mocking. public static partial class UnbrandedTypeSpecModelFactory @@ -27,7 +26,7 @@ public static partial class UnbrandedTypeSpecModelFactory /// description with xml <|endoftext|>. /// optional nullable collection. /// required nullable collection. - /// A new instance for mocking. + /// A new instance for mocking. public static Thing Thing(string name = default, BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable optionalNullableList = default, IEnumerable requiredNullableList = default) { optionalNullableList ??= new ChangeTrackingList(); @@ -75,7 +74,7 @@ public static Thing Thing(string name = default, BinaryData requiredUnion = defa /// optional readonly record of unknown. /// this is a model with required nullable properties. /// Required bytes. - /// A new instance for mocking. + /// A new instance for mocking. public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable requiredCollection = default, IDictionary requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, BinaryData requiredUnknown = default, BinaryData optionalUnknown = default, IDictionary requiredRecordUnknown = default, IDictionary optionalRecordUnknown = default, IReadOnlyDictionary readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, BinaryData requiredBytes = default) { requiredCollection ??= new ChangeTrackingList(); @@ -121,7 +120,7 @@ public static RoundTripModel RoundTripModel(string requiredString = default, int /// required nullable primitive type. /// required nullable extensible enum type. /// required nullable fixed enum type. - /// A new instance for mocking. + /// A new instance for mocking. public static ModelWithRequiredNullableProperties ModelWithRequiredNullableProperties(int? requiredNullablePrimitive = default, StringExtensibleEnum? requiredExtensibleEnum = default, StringFixedEnum? requiredFixedEnum = default) { @@ -130,7 +129,7 @@ public static ModelWithRequiredNullableProperties ModelWithRequiredNullablePrope /// this is not a friendly model but with a friendly name. /// name of the NotFriend. - /// A new instance for mocking. + /// A new instance for mocking. public static Friend Friend(string name = default) { @@ -139,7 +138,7 @@ public static Friend Friend(string name = default) /// this is a model with a projected name. /// name of the ModelWithProjectedName. - /// A new instance for mocking. + /// A new instance for mocking. public static ProjectedModelCustom ProjectedModelCustom(string name = default) { @@ -147,7 +146,7 @@ public static ProjectedModelCustom ProjectedModelCustom(string name = default) } /// The ReturnsAnonymousModelResponse. - /// A new instance for mocking. + /// A new instance for mocking. public static ReturnsAnonymousModelResponse ReturnsAnonymousModelResponse() { diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/tspCodeModel.json index 1519ca64317..3b04736bba7 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/tspCodeModel.json @@ -33,6 +33,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_requiredLiteralString", "isFixed": false, "isFlags": false, @@ -66,6 +67,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_requiredLiteralInt", "isFixed": false, "isFlags": false, @@ -99,6 +101,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_requiredLiteralFloat", "isFixed": false, "isFlags": false, @@ -132,6 +135,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_optionalLiteralString", "isFixed": false, "isFlags": false, @@ -165,6 +169,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_optionalLiteralInt", "isFixed": false, "isFlags": false, @@ -198,6 +203,7 @@ } ], "crossLanguageDefinitionId": "", + "clientNamespace": "UnbrandedTypeSpec", "doc": "The Thing_optionalLiteralFloat", "isFixed": false, "isFlags": false, @@ -269,6 +275,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "Simple enum", "isFixed": true, "isFlags": false, @@ -340,6 +347,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "Extensible enum", "isFixed": false, "isFlags": false, @@ -411,6 +419,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "Int based extensible enum", "isFixed": false, "isFlags": false, @@ -482,6 +491,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "Float based extensible enum", "isFixed": false, "isFlags": false, @@ -553,6 +563,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "float fixed enum", "isFixed": false, "isFlags": false, @@ -624,6 +635,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "float fixed enum", "isFixed": true, "isFlags": false, @@ -695,6 +707,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "float fixed enum", "isFixed": true, "isFlags": false, @@ -766,6 +779,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "doc": "int fixed enum", "isFixed": true, "isFlags": false, @@ -820,6 +834,7 @@ "decorators": [] } ], + "clientNamespace": "UnbrandedTypeSpec", "isFixed": true, "isFlags": false, "usage": "ApiVersionEnum", @@ -831,6 +846,7 @@ "$id": "90", "kind": "model", "name": "Thing", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.Thing", "usage": "Input,Output,Spread,Json", "doc": "A model with a few properties of literal types", @@ -903,6 +919,7 @@ "decorators": [] } ], + "clientNamespace": "", "decorators": [] }, "optional": false, @@ -1208,7 +1225,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": true, "readOnly": false, @@ -1246,7 +1264,8 @@ }, "crossLanguageDefinitionId": "TypeSpec.Array", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -1268,6 +1287,7 @@ "$id": "153", "kind": "model", "name": "RoundTripModel", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.RoundTripModel", "usage": "Input,Output,Json", "doc": "this is a roundtrip model", @@ -1917,6 +1937,7 @@ "$id": "244", "kind": "model", "name": "ModelWithRequiredNullableProperties", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.ModelWithRequiredNullableProperties", "usage": "Input,Output,Json", "doc": "A model with a few required nullable properties", @@ -1937,7 +1958,8 @@ "name": "int32", "crossLanguageDefinitionId": "TypeSpec.int32", "decorators": [] - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -1964,7 +1986,8 @@ "kind": "nullable", "type": { "$ref": "28" - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -1991,7 +2014,8 @@ "kind": "nullable", "type": { "$ref": "20" - } + }, + "clientNamespace": "" }, "optional": false, "readOnly": false, @@ -2060,6 +2084,7 @@ "$id": "264", "kind": "model", "name": "Friend", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.NotFriend", "usage": "Output,Spread,Json", "doc": "this is not a friendly model but with a friendly name", @@ -2098,6 +2123,7 @@ "$id": "269", "kind": "model", "name": "ProjectedModel", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.ModelWithProjectedName", "usage": "Output,Spread,Json", "doc": "this is a model with a projected name", @@ -2136,6 +2162,7 @@ "$id": "274", "kind": "model", "name": "ReturnsAnonymousModelResponse", + "clientNamespace": "UnbrandedTypeSpec", "crossLanguageDefinitionId": "UnbrandedTypeSpec.returnsAnonymousModel.Response.anonymous", "usage": "Output,Json", "decorators": [], @@ -2146,6 +2173,7 @@ { "$id": "275", "Name": "UnbrandedTypeSpecClient", + "ClientNamespace": "UnbrandedTypeSpec", "Doc": "This is a sample typespec project.", "Operations": [ { diff --git a/packages/http-client-csharp/package-lock.json b/packages/http-client-csharp/package-lock.json index 44eb7e2993a..d448573ceb1 100644 --- a/packages/http-client-csharp/package-lock.json +++ b/packages/http-client-csharp/package-lock.json @@ -23,7 +23,7 @@ "@typespec/json-schema": "0.64.0", "@typespec/library-linter": "0.64.0", "@typespec/openapi": "0.64.0", - "@typespec/rest": "0.64.0", + "@typespec/rest": "0.64.1", "@typespec/versioning": "0.64.0", "@typespec/xml": "^0.64.0", "@vitest/coverage-v8": "^2.1.2", @@ -1724,9 +1724,9 @@ } }, "node_modules/@typespec/rest": { - "version": "0.64.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.64.0.tgz", - "integrity": "sha512-7+oUajQzOkZPTMtRiGp6hzTTmy7mRaxOYqxIPgDhYyr9I6oQPLAcBsYhFNk/ulcqld/ApaV5ycXaOlK41REOyQ==", + "version": "0.64.1", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.64.1.tgz", + "integrity": "sha512-DjN68PBch6XOvv8IQ7fRT6aj68akV8GaMLS7J8HGku5zX34dsQBPk+bwMfPlaBg7Y+vUdDyPnbuxvzMY+IKu/Q==", "dev": true, "license": "MIT", "engines": { diff --git a/packages/http-client-csharp/package.json b/packages/http-client-csharp/package.json index 568592f2d6a..5d7de0063b1 100644 --- a/packages/http-client-csharp/package.json +++ b/packages/http-client-csharp/package.json @@ -66,7 +66,7 @@ "@typespec/json-schema": "0.64.0", "@typespec/library-linter": "0.64.0", "@typespec/openapi": "0.64.0", - "@typespec/rest": "0.64.0", + "@typespec/rest": "0.64.1", "@typespec/versioning": "0.64.0", "@typespec/xml": "^0.64.0", "@vitest/coverage-v8": "^2.1.2",