From f6ed89385a71d38b65e564081e59b1cc1d1de981 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 4 Apr 2026 04:12:11 +0000
Subject: [PATCH 1/7] Initial plan


From 6e5d92b1a2641cac59586827cfabe6b69f28bb5e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 4 Apr 2026 04:26:23 +0000
Subject: [PATCH 2/7] Move schema/ConfigurationSchema.json under the Generated
 folder

Updated the generator to write ConfigurationSchema.json to Generated/schema/
instead of schema/. Updated NewProjectScaffolding pack item references and
regenerated all test projects.

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/885ca9bd-de06-4816-8b31-55b8342c3c46

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/ScmCodeModelGenerator.cs                              | 2 +-
 .../src/Primitives/NewProjectScaffolding.cs                   | 4 ++--
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../Local/Sample-TypeSpec/src/SampleTypeSpec.csproj           | 2 +-
 .../api-key/{ => Generated}/schema/ConfigurationSchema.json   | 0
 .../authentication/api-key/src/Authentication.ApiKey.csproj   | 2 +-
 .../custom/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../http/custom/src/Authentication.Http.Custom.csproj         | 2 +-
 .../oauth2/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../authentication/oauth2/src/Authentication.OAuth2.csproj    | 2 +-
 .../union/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../http/authentication/union/src/Authentication.Union.csproj | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Client.Structure.Service.csproj                       | 2 +-
 .../default/{ => Generated}/schema/ConfigurationSchema.json   | 0
 .../default/src/Client.Structure.Service.Default.csproj       | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Client.Structure.Service.Multi.Client.csproj          | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Client.Structure.Service.Renamed.Operation.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Client.Structure.Service.TwoOperationGroup.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../Spector/http/documentation/src/Documentation.csproj       | 2 +-
 .../array/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/encode/array/src/Encode.Array.csproj         | 2 +-
 .../bytes/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/encode/bytes/src/Encode.Bytes.csproj         | 2 +-
 .../datetime/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../Spector/http/encode/datetime/src/Encode.Datetime.csproj   | 2 +-
 .../duration/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../Spector/http/encode/duration/src/Encode.Duration.csproj   | 2 +-
 .../numeric/{ => Generated}/schema/ConfigurationSchema.json   | 0
 .../Spector/http/encode/numeric/src/Encode.Numeric.csproj     | 2 +-
 .../basic/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/parameters/basic/src/Parameters.Basic.csproj | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../body-optionality/src/Parameters.BodyOptionality.csproj    | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../collection-format/src/Parameters.CollectionFormat.csproj  | 2 +-
 .../path/{ => Generated}/schema/ConfigurationSchema.json      | 0
 .../Spector/http/parameters/path/src/Parameters.Path.csproj   | 2 +-
 .../query/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/parameters/query/src/Parameters.Query.csproj | 2 +-
 .../spread/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../http/parameters/spread/src/Parameters.Spread.csproj       | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../content-negotiation/src/Payload.ContentNegotiation.csproj | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../json-merge-patch/src/Payload.JsonMergePatch.csproj        | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../http/payload/media-type/src/Payload.MediaType.csproj      | 2 +-
 .../multipart/{ => Generated}/schema/ConfigurationSchema.json | 0
 .../http/payload/multipart/src/Payload.MultiPart.csproj       | 2 +-
 .../pageable/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../Spector/http/payload/pageable/src/Payload.Pageable.csproj | 2 +-
 .../xml/{ => Generated}/schema/ConfigurationSchema.json       | 0
 .../Spector/http/payload/xml/src/Payload.Xml.csproj           | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj          | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj          | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../status-code-range/src/Response.StatusCodeRange.csproj     | 2 +-
 .../routes/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../TestProjects/Spector/http/routes/src/Routes.csproj        | 2 +-
 .../json/{ => Generated}/schema/ConfigurationSchema.json      | 0
 .../json/src/Serialization.EncodedName.Json.csproj            | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../not-defined/src/Server.Endpoint.NotDefined.csproj         | 2 +-
 .../multiple/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../http/server/path/multiple/src/Server.Path.Multiple.csproj | 2 +-
 .../single/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../http/server/path/single/src/Server.Path.Single.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../not-versioned/src/Server.Versions.NotVersioned.csproj     | 2 +-
 .../versioned/{ => Generated}/schema/ConfigurationSchema.json | 0
 .../versions/versioned/src/Server.Versions.Versioned.csproj   | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/SpecialHeaders.ConditionalRequest.csproj              | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../repeatability/src/SpecialHeaders.Repeatability.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../Spector/http/special-words/src/SpecialWords.csproj        | 2 +-
 .../array/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/type/array/src/Type.Array.csproj             | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../Spector/http/type/dictionary/src/Type.Dictionary.csproj   | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../http/type/enum/extensible/src/Type.Enum.Extensible.csproj | 2 +-
 .../fixed/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj   | 2 +-
 .../empty/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/type/model/empty/src/Type.Model.Empty.csproj | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Type.Model.Inheritance.EnumDiscriminator.csproj       | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Type.Model.Inheritance.NestedDiscriminator.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Type.Model.Inheritance.NotDiscriminated.csproj        | 2 +-
 .../recursive/{ => Generated}/schema/ConfigurationSchema.json | 0
 .../recursive/src/Type.Model.Inheritance.Recursive.csproj     | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Type.Model.Inheritance.SingleDiscriminator.csproj     | 2 +-
 .../usage/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/type/model/usage/src/Type.Model.Usage.csproj | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../type/model/visibility/src/Type.Model.Visibility.csproj    | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../src/Type.Property.AdditionalProperties.csproj             | 2 +-
 .../nullable/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../type/property/nullable/src/Type.Property.Nullable.csproj  | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../property/optionality/src/Type.Property.Optional.csproj    | 2 +-
 .../{ => Generated}/schema/ConfigurationSchema.json           | 0
 .../property/value-types/src/Type.Property.ValueTypes.csproj  | 2 +-
 .../scalar/{ => Generated}/schema/ConfigurationSchema.json    | 0
 .../Spector/http/type/scalar/src/Type.Scalar.csproj           | 2 +-
 .../union/{ => Generated}/schema/ConfigurationSchema.json     | 0
 .../Spector/http/type/union/src/Type.Union.csproj             | 2 +-
 .../added/v1/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../http/versioning/added/v1/src/Versioning.Added.V1.csproj   | 2 +-
 .../added/v2/{ => Generated}/schema/ConfigurationSchema.json  | 0
 .../http/versioning/added/v2/src/Versioning.Added.V2.csproj   | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../madeOptional/v1/src/Versioning.MadeOptional.V1.csproj     | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../madeOptional/v2/src/Versioning.MadeOptional.V2.csproj     | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../versioning/removed/v1/src/Versioning.Removed.V1.csproj    | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../versioning/removed/v2/src/Versioning.Removed.V2.csproj    | 2 +-
 .../v2Preview/{ => Generated}/schema/ConfigurationSchema.json | 0
 .../removed/v2Preview/src/Versioning.Removed.V2Preview.csproj | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj       | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj       | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj         | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj         | 2 +-
 .../v1/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../v1/src/Versioning.TypeChangedFrom.V1.csproj               | 2 +-
 .../v2/{ => Generated}/schema/ConfigurationSchema.json        | 0
 .../v2/src/Versioning.TypeChangedFrom.V2.csproj               | 2 +-
 146 files changed, 75 insertions(+), 75 deletions(-)
 rename packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/routes/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/{ => Generated}/schema/ConfigurationSchema.json (100%)
 rename packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/{ => Generated}/schema/ConfigurationSchema.json (100%)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
index 5725dedc32f..7963d37f255 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
@@ -60,7 +60,7 @@ public override async Task WriteAdditionalFiles(string outputPath)
                 ConfigurationSchema.OptionsRef);
             if (schemaContent != null)
             {
-                var schemaPath = Path.Combine(outputPath, "schema", "ConfigurationSchema.json");
+                var schemaPath = Path.Combine(outputPath, "Generated", "schema", "ConfigurationSchema.json");
                 var schemaDir = Path.GetDirectoryName(schemaPath);
                 if (schemaDir != null)
                 {
diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index 74c74c62e48..81cab18c498 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -73,10 +73,10 @@ protected virtual string GetSourceProjectFileContent()
 
             // Add pack items for ConfigurationSchema.json and .targets file
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
+            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
             if (File.Exists(schemaPath))
             {
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\schema\ConfigurationSchema.json", @"\"));
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
             }
 
diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
index 633e517ed50..155e2653d9d 100644
--- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\SampleTypeSpec.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SampleTypeSpec.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
index 69c033b2e6c..9bc0d55655e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Authentication.ApiKey.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.ApiKey.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
index 9eec620d6e7..9adda454f93 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Authentication.Http.Custom.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.Http.Custom.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
index 54aaff9cbeb..cc511afb644 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Authentication.OAuth2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.OAuth2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
index a911fec8d51..a0db46d4c37 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Authentication.Union.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.Union.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
index 88ca9df6442..a16ed7db93b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Client.Structure.Service.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
index 2895afe83b2..0b080a1f5ed 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Client.Structure.Service.Default.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Default.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
index 055841ee7de..ee07fbfa38f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Client.Structure.Service.Multi.Client.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Multi.Client.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
index 4507c8799d8..37d7827ffde 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Client.Structure.Service.Renamed.Operation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Renamed.Operation.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
index f448d8180fe..e5830fd996a 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Client.Structure.Service.TwoOperationGroup.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.TwoOperationGroup.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
index 1080a510b71..9018fac9650 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Documentation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Documentation.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
index 6a07d0e4316..2c5e8aa1116 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Encode.Array.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Array.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
index f5f0f469a04..6856e4ec83c 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Encode.Bytes.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Bytes.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
index 7ce48712307..6b285b889b3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Encode.Datetime.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Datetime.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
index cc2c673c47c..0b09a1fa0ba 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Encode.Duration.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Duration.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
index 1d89e893d40..2f7ab56954a 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Encode.Numeric.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Numeric.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
index 771cb83ea00..200605ce4ee 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.Basic.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Basic.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
index cebede3fbfd..09ffa6a1edd 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.BodyOptionality.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.BodyOptionality.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
index 26f68b5ca9a..b953f0a3771 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.CollectionFormat.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.CollectionFormat.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
index 8a54b871c62..0dc89295a57 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.Path.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Path.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
index 064c41e364c..f675c78b200 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.Query.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Query.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
index cd7f87bb1e4..c799a563e0a 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Parameters.Spread.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Spread.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
index 56e913ccc3c..0237cec1351 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.ContentNegotiation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.ContentNegotiation.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
index 254b584387d..d3d1e4c2778 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.JsonMergePatch.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.JsonMergePatch.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
index 8281cc20c4d..2fb2c3c4657 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.MediaType.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.MediaType.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
index 37c3a8b2458..0bd10b19ed0 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.MultiPart.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.MultiPart.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
index c4237d41dbf..86f22a60ab5 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.Pageable.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.Pageable.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
index 1636376e015..84362a38a77 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Payload.Xml.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.Xml.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
index 56a8622b66f..158f68bb914 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Resiliency.SrvDriven.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Resiliency.SrvDriven.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
index 42a6d3226ab..30dae266b12 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Resiliency.SrvDriven.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Resiliency.SrvDriven.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
index 769e2d4e7a4..d28a8cefed3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Response.StatusCodeRange.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Response.StatusCodeRange.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/routes/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
index 8ee0dca08ad..4b2d88403c3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Routes.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Routes.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
index 77f1356aebd..903f9748d28 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Serialization.EncodedName.Json.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Serialization.EncodedName.Json.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
index 206322eb5f6..51950f9c6bc 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Server.Endpoint.NotDefined.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Endpoint.NotDefined.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
index 6277265ac00..60f9090a352 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Server.Path.Multiple.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Path.Multiple.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
index 424780b201e..5712462d9a7 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Server.Path.Single.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Path.Single.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
index f604e7c53de..54f04ffde69 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Server.Versions.NotVersioned.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Versions.NotVersioned.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
index 8fa0f366933..848695e24eb 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Server.Versions.Versioned.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Versions.Versioned.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
index 329eb3c8050..ae5b66d8100 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\SpecialHeaders.ConditionalRequest.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialHeaders.ConditionalRequest.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
index d8427118057..4a41adcefe4 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\SpecialHeaders.Repeatability.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialHeaders.Repeatability.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
index ebfba0cb721..c9c5e6ea116 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\SpecialWords.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialWords.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
index 4cb7bc7df17..2a25e1319cc 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Array.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Array.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
index ce97388cc58..ea98ba17648 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Dictionary.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Dictionary.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
index 79a71255b36..2b969a7821b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Enum.Extensible.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Enum.Extensible.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
index 973f665dee4..fcaba6c305f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Enum.Fixed.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Enum.Fixed.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
index f3d0275f70f..7521a83810e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Empty.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Empty.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
index 46278f5bd8e..0ac970a8693 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Inheritance.EnumDiscriminator.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Inheritance.EnumDiscriminator.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
index 8d7f0909ed8..315202455ce 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Inheritance.NestedDiscriminator.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Inheritance.NestedDiscriminator.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
index 946eea44c80..54e293fc407 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Inheritance.NotDiscriminated.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Inheritance.NotDiscriminated.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
index 457c7301afe..b2441f862e5 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Inheritance.Recursive.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Inheritance.Recursive.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
index 947f88a8398..6682bd9dce1 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Inheritance.SingleDiscriminator.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Inheritance.SingleDiscriminator.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
index 28b2773d3ab..d1eb6c72547 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Usage.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Usage.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
index 0f7078276a3..fd033366bfc 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Model.Visibility.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Model.Visibility.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
index 552b7ca3ef2..5300a4b5bbe 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Property.AdditionalProperties.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Property.AdditionalProperties.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
index 52d97e0498c..7c66e997909 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Property.Nullable.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Property.Nullable.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
index 6ab95c43208..6b53ec32395 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Property.Optional.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Property.Optional.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
index 3a9cd7a63ff..659d3bd4a6b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Property.ValueTypes.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Property.ValueTypes.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
index b06ec818218..561732ea7a0 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Scalar.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Scalar.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
index 80d98052a44..13c9ea7cc69 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Type.Union.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Union.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
index 540c0ce0b5a..0ed1430ba64 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.Added.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.Added.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
index c9ec63cf281..c8710de28ca 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.Added.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.Added.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
index 8ea2a6de1eb..6a063928b6a 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.MadeOptional.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.MadeOptional.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
index f990f92fc68..d9239f7a630 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.MadeOptional.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.MadeOptional.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
index 180a124a477..9e69b204cf9 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.Removed.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.Removed.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
index b1309bb9703..60dce52797f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.Removed.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.Removed.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
index 8d4f1884481..75461886517 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.Removed.V2Preview.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.Removed.V2Preview.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
index f2b6a69a9c7..e9c80186542 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.RenamedFrom.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.RenamedFrom.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
index 4802af20acd..9c47fb00259 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.RenamedFrom.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.RenamedFrom.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
index adf5ce55b5a..5c7638126c2 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.ReturnTypeChangedFrom.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.ReturnTypeChangedFrom.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
index 9c8d9121e17..5196830b4c4 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.ReturnTypeChangedFrom.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.ReturnTypeChangedFrom.V2.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
index 7139bd06976..b0ef8e1aa5e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.TypeChangedFrom.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.TypeChangedFrom.V1.targets" />
   </ItemGroup>
 </Project>
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
index fdacda26035..3f003acf02c 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
+    <None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
     <None Include="..\Versioning.TypeChangedFrom.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Versioning.TypeChangedFrom.V2.targets" />
   </ItemGroup>
 </Project>

From 3e82ed47398038891e27fe294daa0b9f73bcebf1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:33:19 +0000
Subject: [PATCH 3/7] Skip schema generation when a custom
 ConfigurationSchema.json exists

When a custom ConfigurationSchema.json is detected at schema/ConfigurationSchema.json
(outside the Generated folder), the generator now skips generating the schema and
.targets files. NewProjectScaffolding also checks the custom path first for pack items.

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/6cd1df1d-4044-4894-abb7-7c77d70b9a50

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/ScmCodeModelGenerator.cs                       |  8 ++++++++
 .../src/Primitives/NewProjectScaffolding.cs            | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
index 7963d37f255..7cbdd3acb3a 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
@@ -54,6 +54,14 @@ protected override void Configure()
 
         public override async Task WriteAdditionalFiles(string outputPath)
         {
+            // Skip generation if a custom ConfigurationSchema.json exists outside the Generated folder
+            var customSchemaPath = Path.Combine(outputPath, "schema", "ConfigurationSchema.json");
+            if (File.Exists(customSchemaPath))
+            {
+                Emitter.Info($"Custom ConfigurationSchema.json detected at {Path.GetFullPath(customSchemaPath)}, skipping generation.");
+                return;
+            }
+
             var schemaContent = ConfigurationSchemaGenerator.Generate(
                 OutputLibrary,
                 ConfigurationSchema.SectionName,
diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index 81cab18c498..8cac01f5f4c 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -73,8 +73,14 @@ protected virtual string GetSourceProjectFileContent()
 
             // Add pack items for ConfigurationSchema.json and .targets file
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
-            if (File.Exists(schemaPath))
+            var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
+            var generatedSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
+            if (File.Exists(customSchemaPath))
+            {
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\schema\ConfigurationSchema.json", @"\"));
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
+            }
+            else if (File.Exists(generatedSchemaPath))
             {
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));

From 430ffb9e65fe1670cb633295108736f0ce447d42 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:35:34 +0000
Subject: [PATCH 4/7] Revert NewProjectScaffolding.cs to original state

Per review feedback: NewProjectScaffolding doesn't need to handle the
custom schema path since it wouldn't be executing when a custom schema
exists.

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/9eb66940-80a6-42d3-b9c1-78eacaa4d459

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/Primitives/NewProjectScaffolding.cs            | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index 8cac01f5f4c..74c74c62e48 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -73,18 +73,12 @@ protected virtual string GetSourceProjectFileContent()
 
             // Add pack items for ConfigurationSchema.json and .targets file
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
-            var generatedSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
-            if (File.Exists(customSchemaPath))
+            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
+            if (File.Exists(schemaPath))
             {
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\schema\ConfigurationSchema.json", @"\"));
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
             }
-            else if (File.Exists(generatedSchemaPath))
-            {
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
-            }
 
             return builder.Write();
         }

From 220d3a5d5768aa75575553d42dbf8060cf1184f1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:23:38 +0000
Subject: [PATCH 5/7] Update NewProjectScaffolding.cs to check
 Generated/schema/ path

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/1aedace8-6e7c-4cd2-a69d-7a7e3f17fe23

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/Primitives/NewProjectScaffolding.cs                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index 74c74c62e48..81cab18c498 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -73,10 +73,10 @@ protected virtual string GetSourceProjectFileContent()
 
             // Add pack items for ConfigurationSchema.json and .targets file
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
+            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
             if (File.Exists(schemaPath))
             {
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\schema\ConfigurationSchema.json", @"\"));
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
                 builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
             }
 

From b70aaec50f89f740617ba57ee84ca3e9cd4b48ce Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:39:49 +0000
Subject: [PATCH 6/7] Remove File.Exists check in NewProjectScaffolding.cs -
 schema always generated

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/100fa1fc-602a-41ef-a835-888bd1dfd935

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/Primitives/NewProjectScaffolding.cs               | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index 81cab18c498..f11d66b3a3d 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -73,12 +73,8 @@ protected virtual string GetSourceProjectFileContent()
 
             // Add pack items for ConfigurationSchema.json and .targets file
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
-            if (File.Exists(schemaPath))
-            {
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
-                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
-            }
+            builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
+            builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
 
             return builder.Write();
         }

From fcd41ca189f817a0665419cb92872a668da294d4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:53:04 +0000
Subject: [PATCH 7/7] Guard pack items with custom schema check in
 NewProjectScaffolding.cs

Agent-Logs-Url: https://github.com/microsoft/typespec/sessions/667520e0-32c6-45e8-8014-50f27f81cefb

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
---
 .../src/Primitives/NewProjectScaffolding.cs            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index f11d66b3a3d..5e90575a936 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -71,10 +71,14 @@ protected virtual string GetSourceProjectFileContent()
                 builder.CompileIncludes.Add(compileInclude);
             }
 
-            // Add pack items for ConfigurationSchema.json and .targets file
+            // Add pack items for ConfigurationSchema.json and .targets file if no custom schema is defined
             var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
-            builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
-            builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
+            var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
+            if (!File.Exists(customSchemaPath))
+            {
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
+                builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
+            }
 
             return builder.Write();
         }